Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'ml/cygwin-mingw-headers' into next

Finishing touch to rename a confusingly named preprocessor macro.

Will merge to 'master' in the sixth batch.

* ml/cygwin-mingw-headers:
  USE CGYWIN_V15_WIN32API as macro to select api for cygwin
  • Loading branch information...
commit f9964da67e06e1ba462f5ed39d11b5d59fbcaf01 2 parents 7d2aa24 + 9fca6cf
Junio C Hamano authored

Showing 2 changed files with 4 additions and 4 deletions. Show diff stats Hide diff stats

  1. 6  Makefile
  2. 2  compat/cygwin.c
6  Makefile
@@ -1089,7 +1089,7 @@ ifeq ($(uname_O),Cygwin)
1089 1089
 		NO_SYMLINK_HEAD = YesPlease
1090 1090
 		NO_IPV6 = YesPlease
1091 1091
 		OLD_ICONV = UnfortunatelyYes
1092  
-		V15_MINGW_HEADERS = YesPlease
  1092
+		CYGWIN_V15_WIN32API = YesPlease
1093 1093
 	endif
1094 1094
 	NO_THREAD_SAFE_PREAD = YesPlease
1095 1095
 	NEEDS_LIBICONV = YesPlease
@@ -1901,8 +1901,8 @@ ifdef NO_REGEX
1901 1901
 	COMPAT_CFLAGS += -Icompat/regex
1902 1902
 	COMPAT_OBJS += compat/regex/regex.o
1903 1903
 endif
1904  
-ifdef V15_MINGW_HEADERS
1905  
-	COMPAT_CFLAGS += -DV15_MINGW_HEADERS
  1904
+ifdef CYGWIN_V15_WIN32API
  1905
+	COMPAT_CFLAGS += -DCYGWIN_V15_WIN32API
1906 1906
 endif
1907 1907
 
1908 1908
 ifdef USE_NED_ALLOCATOR
2  compat/cygwin.c
... ...
@@ -1,5 +1,5 @@
1 1
 #define WIN32_LEAN_AND_MEAN
2  
-#ifdef V15_MINGW_HEADERS
  2
+#ifdef CYGWIN_V15_WIN32API
3 3
 #include "../git-compat-util.h"
4 4
 #include "win32.h"
5 5
 #else

0 notes on commit f9964da

Please sign in to comment.
Something went wrong with that request. Please try again.