From d622beb3c39f5110a5316234812ae3a0dd45e9af Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 29 Sep 2010 18:42:28 +0200
Subject: updated for version 7.3.018 Problem:    Missing argument to windres
 in MingW makefiles. Solution:   Add the argument that was wrapped in the
 patch. (Jon Maken)

---
 src/GvimExt/Make_ming.mak | 2 +-
 src/Make_ming.mak         | 2 +-
 src/version.c             | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/GvimExt/Make_ming.mak b/src/GvimExt/Make_ming.mak
index f7265e9b2..3d9474347 100644
--- a/src/GvimExt/Make_ming.mak
+++ b/src/GvimExt/Make_ming.mak
@@ -33,7 +33,7 @@ DEL = del
 endif
 endif
 CXX := $(CROSS_COMPILE)g++
-WINDRES := $(CROSS_COMPILE)windres --preprocessor="$(CXX) -E -xc" -
+WINDRES := $(CROSS_COMPILE)windres --preprocessor="$(CXX) -E -xc" -DRC_INVOKED
 LIBS :=  -luuid
 RES  := gvimext.res
 DEFFILE = gvimext_ming.def
diff --git a/src/Make_ming.mak b/src/Make_ming.mak
index 971915cbc..a6fd17082 100644
--- a/src/Make_ming.mak
+++ b/src/Make_ming.mak
@@ -303,7 +303,7 @@ DIRSLASH = \\
 endif
 endif
 CC := $(CROSS_COMPILE)gcc
-WINDRES := $(CROSS_COMPILE)windres --preprocessor="$(CC) -E -xc" -
+WINDRES := $(CROSS_COMPILE)windres --preprocessor="$(CC) -E -xc" -DRC_INVOKED
 
 #>>>>> end of choices
 ###########################################################################
diff --git a/src/version.c b/src/version.c
index d04419c3c..2154b3c13 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    18,
 /**/
     17,
 /**/
-- 
cgit v1.2.3