diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-11 13:30:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-11 13:30:20 -0700 |
| commit | e936318aa61760a8fe02557bd3c241136613fb34 (patch) | |
| tree | 0c6eba82cb2eecd1a462e702e93aa89b55370462 /Makefile | |
| parent | a62d73e7c6fff96ea7fb2133b3e127a4a4bda957 (diff) | |
| parent | 83ff1da3e81824eebf0425ad9200248ea7205c35 (diff) | |
| download | git-e936318aa61760a8fe02557bd3c241136613fb34.tar.gz | |
Merge branch 'rj/mingw-cygwin'
Update build for Cygwin 1.[57]. Torsten Bögershausen reports that
this is fine with Cygwin 1.7 ($gmane/225824) so let's try moving it
ahead.
* rj/mingw-cygwin:
cygwin: Remove the CYGWIN_V15_WIN32API build variable
mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 0 insertions, 7 deletions
@@ -297,10 +297,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. # @@ -1476,9 +1472,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 |