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

diff --combined Makefile
index ea5c106bb293b4068bdcdfe434fd60f8e76d70bc,4d47af5d6b24aa51589b9c3d7a3e9eb5c4a39711..9bc5e403650d171f1b5e5a6868fdd66009739b7d
--- 1/Makefile
--- 2/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