cygwin: Remove the CYGWIN_V15_WIN32API build variable

Ramsay Jones · gitster · commit 83ff1da3e818 · 2013-05-08T12:15:44.000-07:00
Commit 380a4d9 ("Update cygwin.c for new mingw-64 win32 api headers", 11-11-2012) solved an header include order problem on cygwin 1.7 when using the new mingw-64 WIN32 API headers. The solution involved using a new build variable (V15_MINGW_HEADERS) to conditionally compile the cygwin.c source file to use an include order appropriate for the old and new header files. (The build variable was later renamed in commit 9fca6cf to CYGWIN_V15_WIN32API). The include order used for cygwin 1.7 includes the "win32.h" header before "../git-compat-util.h". This order was problematic on cygwin 1.5, since it lead to the WIN32 symbol being defined along with the inclusion of some WIN32 API headers (e.g. <winsock2.h>) which cause compilation errors. The header include order problem on cygwin 1.5 has since been fixed (see commit "mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE"), so we can now remove the conditional compilation along with the associated CYGWIN_V15_WIN32API build variable. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/Makefile b/Makefile
@@ -290,10 +290,6 @@ all::
 #
 # Define NO_REGEX if you have no or inferior regex support in your C library.
 #
-# Define CYGWIN_V15_WIN32API if you are using Cygwin v1.7.x but are not
-# using the current w32api packages. The recommended approach, however,
-# is to update your installation if compilation errors occur.
-#
 # Define HAVE_DEV_TTY if your system can open /dev/tty to interact with the
 # user.
 #
@@ -1449,9 +1445,6 @@ ifdef NO_REGEX
 	COMPAT_CFLAGS += -Icompat/regex
 	COMPAT_OBJS += compat/regex/regex.o
 endif
-ifdef CYGWIN_V15_WIN32API
-	COMPAT_CFLAGS += -DCYGWIN_V15_WIN32API
-endif
 
 ifdef USE_NED_ALLOCATOR
        COMPAT_CFLAGS += -Icompat/nedmalloc
diff --git a/compat/cygwin.c b/compat/cygwin.c
@@ -1,14 +1,9 @@
 #define CYGWIN_C
 #define WIN32_LEAN_AND_MEAN
-#ifdef CYGWIN_V15_WIN32API
-#include "../git-compat-util.h"
-#include "win32.h"
-#else
 #include <sys/stat.h>
 #include <sys/errno.h>
 #include "win32.h"
 #include "../git-compat-util.h"
-#endif
 #include "../cache.h" /* to read configuration */
 
 /*
diff --git a/config.mak.uname b/config.mak.uname
@@ -158,7 +158,6 @@ ifeq ($(uname_O),Cygwin)
 		NO_SYMLINK_HEAD = YesPlease
 		NO_IPV6 = YesPlease
 		OLD_ICONV = UnfortunatelyYes
-		CYGWIN_V15_WIN32API = YesPlease
 	endif
 	NO_THREAD_SAFE_PREAD = YesPlease
 	NEEDS_LIBICONV = YesPlease

Original file line number	Diff line number	Diff line change
`@@ -290,10 +290,6 @@ all::`
`290`	`290`	`#`
`291`	`291`	`# Define NO_REGEX if you have no or inferior regex support in your C library.`
`292`	`292`	`#`
`293`		`-# Define CYGWIN_V15_WIN32API if you are using Cygwin v1.7.x but are not`
`294`		`-# using the current w32api packages. The recommended approach, however,`
`295`		`-# is to update your installation if compilation errors occur.`
`296`		`-#`
`297`	`293`	`# Define HAVE_DEV_TTY if your system can open /dev/tty to interact with the`
`298`	`294`	`# user.`
`299`	`295`	`#`
`@@ -1449,9 +1445,6 @@ ifdef NO_REGEX`
`1449`	`1445`	`COMPAT_CFLAGS += -Icompat/regex`
`1450`	`1446`	`COMPAT_OBJS += compat/regex/regex.o`
`1451`	`1447`	`endif`
`1452`		`-ifdef CYGWIN_V15_WIN32API`
`1453`		`- COMPAT_CFLAGS += -DCYGWIN_V15_WIN32API`
`1454`		`-endif`
`1455`	`1448`
`1456`	`1449`	`ifdef USE_NED_ALLOCATOR`
`1457`	`1450`	`COMPAT_CFLAGS += -Icompat/nedmalloc`