summaryrefslogtreecommitdiff
path: root/config.mak.uname
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-11 20:30:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-11 20:30:20 (GMT)
commite936318aa61760a8fe02557bd3c241136613fb34 (patch)
tree0c6eba82cb2eecd1a462e702e93aa89b55370462 /config.mak.uname
parenta62d73e7c6fff96ea7fb2133b3e127a4a4bda957 (diff)
parent83ff1da3e81824eebf0425ad9200248ea7205c35 (diff)
downloadgit-e936318aa61760a8fe02557bd3c241136613fb34.zip
git-e936318aa61760a8fe02557bd3c241136613fb34.tar.gz
git-e936318aa61760a8fe02557bd3c241136613fb34.tar.bz2
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 'config.mak.uname')
-rw-r--r--config.mak.uname1
1 files changed, 0 insertions, 1 deletions
diff --git a/config.mak.uname b/config.mak.uname
index 5354007..7ac541e 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -159,7 +159,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