patch 7.4.1175

Problem:    Can't build with Mingw and Cygwin.
Solution:   Remove extra "endif". (Christian J. Robinson)

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 5c7332e1c515a694ed7ea47c1bf61a4ed651827e..026c966bfe8d482696a37eae93caffe3dc626639 100644 (file)
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -693,7 +693,6 @@ ifneq ($(NETBEANS),yes)
 LIB += -lwsock32
 endif
 endif
-endif
 
 ifeq ($(DIRECTX),yes)
 # Only allow DIRECTX for a GUI build.

diff --git a/src/version.c b/src/version.c
index 042454f064fdad89ec23e7890a73b12713bb550a..9568029c449e610bdac5cb8da5df73f05300a981 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1175,
 /**/
     1174,
 /**/