summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-12-22 20:26:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-12-22 20:26:46 (GMT)
commit7665d9c3a63a026ab4d83411fc699b82ab310b3c (patch)
treefbda757896b3e3b3401a1c873a1d4ac657a68635
parent4762c7b42a1fe701670b4564300abc6c13c4ec00 (diff)
parent3a0a3a8972369060a1eff8353b64bf7377714b22 (diff)
downloadgit-7665d9c3a63a026ab4d83411fc699b82ab310b3c.zip
git-7665d9c3a63a026ab4d83411fc699b82ab310b3c.tar.gz
git-7665d9c3a63a026ab4d83411fc699b82ab310b3c.tar.bz2
Merge branch 'rj/no-xopen-source-for-cygwin'
Avoid compilation warnings on recent gcc toolchain on Cygwin. * rj/no-xopen-source-for-cygwin: git-compat-util.h: don't define _XOPEN_SOURCE on cygwin
-rw-r--r--git-compat-util.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index 400e921..cef2691 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -75,7 +75,8 @@
# endif
#elif !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__USLC__) && \
!defined(_M_UNIX) && !defined(__sgi) && !defined(__DragonFly__) && \
- !defined(__TANDEM) && !defined(__QNX__) && !defined(__MirBSD__)
+ !defined(__TANDEM) && !defined(__QNX__) && !defined(__MirBSD__) && \
+ !defined(__CYGWIN__)
#define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500, OpenBSD needs 600 for S_ISLNK() */
#define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */
#endif