aboutsummaryrefslogtreecommitdiff
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-05-31 16:18:02 -0700
committerJunio C Hamano <gitster@pobox.com>2009-05-31 16:18:02 -0700
commit714cdcd03e2caac6e2dc8d94debc7c800742f546 (patch)
tree12797b5947f811b1dfd96208bfc93207a0ac85e5 /git-compat-util.h
parentc6e73936b9ea26fcad0d77d68194545082343c43 (diff)
parenta0c0be97d492ea870cb8fb626eaca43b4d9cf34f (diff)
downloadgit-714cdcd03e2caac6e2dc8d94debc7c800742f546.tar.xz
Merge branch 'jc/solaris-0811'
* jc/solaris-0811: OpenSolaris 200811 (SunOS 5.11) does not want OLD_ICONV Teach Solaris that _XOPEN_SOURCE=600 really menas XPG6
Diffstat (limited to 'git-compat-util.h')
-rw-r--r--git-compat-util.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index c7cf2d5d9c..4236647c91 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -41,8 +41,10 @@
#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__USLC__) && !defined(_M_UNIX)
#define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500, OpenBSD needs 600 for S_ISLNK() */
+#ifndef __sun__
#define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */
#endif
+#endif
#define _ALL_SOURCE 1
#define _GNU_SOURCE 1
#define _BSD_SOURCE 1