diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-23 01:06:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-23 05:52:00 (GMT) |
| commit | 30d8080ca76432a60142f6af04e477bfa24b7f4c (patch) | |
| tree | e103476c574d9cd6240a18d230b38366c7673254 /git-compat-util.h | |
| parent | a80aad7b85fc560451e07792d64ab6cb15a39914 (diff) | |
| download | git-30d8080ca76432a60142f6af04e477bfa24b7f4c.zip git-30d8080ca76432a60142f6af04e477bfa24b7f4c.tar.gz git-30d8080ca76432a60142f6af04e477bfa24b7f4c.tar.bz2 | |
Teach Solaris that _XOPEN_SOURCE=600 really menas XPG6
In git-compat-util.h, we do
#define _XOPEN_SOURCE 600
#define _XOPEN_SOURCE_EXTENDED 1
unless we are on BSD or SCO.
On OpenSolaris (200811), /usr/include/sys/feature_tests.h has this nice
table:
Feature Test Macro Specification
------------------------------------------------ -------------
_XOPEN_SOURCE XPG3
_XOPEN_SOURCE && _XOPEN_VERSION = 4 XPG4
_XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED = 1 XPG4v2
_XOPEN_SOURCE = 500 XPG5
_XOPEN_SOURCE = 600 (or POSIX_C_SOURCE=200112L) XPG6
Later in the same header, compilation with -c99 is made to fail if _XPG6 is
not set, like this:
#if defined(_STDC_C99) && (defined(__XOPEN_OR_POSIX) && !defined(_XPG6))
#error "Compiler or options invalid for pre-UNIX 03 X/Open applications \
and pre-2001 POSIX applications"
#elif ...
The problem is that they check things in an order that is inconvenient for
us. When they see _XOPEN_SOURCE_EXTENDED, they declare that we are XPG4v2,
regardless of the value of _XOPEN_SOURCE.
To work around this problem, do not define _XOPEN_SOURCE_EXTENDED on
Sun's.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-compat-util.h')
| -rw-r--r-- | git-compat-util.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index c7cf2d5..4236647 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 |