updated for version 7.4.030

Problem:    The -mno-cygwin argument is no longer supported by Cygwin.
Solution:   Remove the arguments. (Steve Hall)

diff --git a/src/GvimExt/Make_cyg.mak b/src/GvimExt/Make_cyg.mak
index 80a2a65d99f301a89ccaab51b23bd8d1023ad98c..a638688b7ab3d600e7b47b5e7438aaef1e77aafa 100644 (file)
--- a/src/GvimExt/Make_cyg.mak
+++ b/src/GvimExt/Make_cyg.mak
@@ -31,12 +31,12 @@ endif
 ifeq ($(CROSS),yes)
 DEL = rm
 ifeq ($(MINGWOLD),yes)
-CXXFLAGS := -O2 -mno-cygwin -fvtable-thunks
+CXXFLAGS := -O2 -fvtable-thunks
 else
-CXXFLAGS := -O2 -mno-cygwin
+CXXFLAGS := -O2
 endif
 else
-CXXFLAGS := -O2 -mno-cygwin
+CXXFLAGS := -O2
 ifneq (sh.exe, $(SHELL))
 DEL = rm
 else

diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak
index f955b4d03cf1be76b5ffbdb3d75e743fc0cc81f2..ee51c240506238df9680235d919896ba2036ffd2 100644 (file)
--- a/src/Make_cyg.mak
+++ b/src/Make_cyg.mak
@@ -1,6 +1,6 @@
 #
 # Makefile for VIM on Win32, using Cygnus gcc
-# Last updated by Dan Sharp.  Last Change: 2013 Apr 22
+# Last updated by Dan Sharp.  Last Change: 2013 Sep 19
 #
 # Also read INSTALLpc.txt!
 #
@@ -439,8 +439,6 @@ endif
 ##############################
 ifeq (yes, $(USEDLL))
 DEFINES += -D_MAX_PATH=256 -D__CYGWIN__
-else
-INCLUDES += -mno-cygwin
 endif
 
 ##############################

diff --git a/src/version.c b/src/version.c
index 5faeb35be008f366eb674eaab4ed04252371fa19..272940af8d3446d3f4495e7dd0451cedb94223c2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    30,
 /**/
     29,
 /**/

diff --git a/src/xxd/Make_cyg.mak b/src/xxd/Make_cyg.mak
index ba74b1808540175b4acc94f5d1f7859feae66ebe..4f344f0383a62bdab2f7742ea72eb38756bf3db6 100644 (file)
--- a/src/xxd/Make_cyg.mak
+++ b/src/xxd/Make_cyg.mak
@@ -8,7 +8,7 @@ ifeq (yes, $(USEDLL))
 DEFINES =
 LIBS    = -lc
 else
-DEFINES = -mno-cygwin
+DEFINES =
 LIBS    =
 endif