From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 20 Nov 2012 18:44:29 +0000 (-0800)
Subject: Merge branch 'ml/cygwin-mingw-headers'
X-Git-Tag: v1.8.1-rc0~43
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2f2c7e12524e337dff7dae9df7b431c81f150136?ds=inline;hp=-c

Merge branch 'ml/cygwin-mingw-headers'

Make git compile on cygwin with newer header files.

* ml/cygwin-mingw-headers:
USE CGYWIN_V15_WIN32API as macro to select api for cygwin
Update cygwin.c for new mingw-64 win32 api headers
---

2f2c7e12524e337dff7dae9df7b431c81f150136
diff --combined Makefile
index ea5c106bb2,4d47af5d6b..9bc5e40365
--- a/Makefile
+++ b/Makefile
@@@ -1086,6 -1086,7 +1086,7 @@@ 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
@@@ -1385,10 -1386,6 +1386,10 @@@ ifeq ($(uname_S),NONSTOP_KERNEL
  	MKDIR_WO_TRAILING_SLASH = YesPlease
  	# RFE 10-120912-4693 submitted to HP NonStop development.
  	NO_SETITIMER = UnfortunatelyYes
 +	SANE_TOOL_PATH=/usr/coreutils/bin:/usr/local/bin
 +	SHELL_PATH=/usr/local/bin/bash
 +	# as of H06.25/J06.14, we might better use this
 +	#SHELL_PATH=/usr/coreutils/bin/bash
  endif
  ifneq (,$(findstring MINGW,$(uname_S)))
  	pathsep = ;
@@@ -1897,6 -1894,9 +1898,9 @@@ ifdef NO_REGE
  	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