From: Brandon Casey <casey@nrlssc.navy.mil>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>
Subject: Re: [RFC/PATCH 1/2] Teach Solaris that _XOPEN_SOURCE=600 really menas XPG6
Date: Thu, 28 May 2009 11:46:50 -0500 [thread overview]
Message-ID: <WLNdjYtfqcg2bT6yOBtAykIqOBTeSLRUdlB6-sTM2KzTjwOmzN3fLg@cipher.nrlssc.navy.mil> (raw)
In-Reply-To: <1243106697-6424-2-git-send-email-gitster@pobox.com>
Junio C Hamano wrote:
> 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>
> ---
> 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__
__sun__ is not defined by the SUNWspro compiler. We can fix that by adding
a -D__sun__ in the SunOS section of the Makefile though.
A more important issue, is that now that this causes _XPG6 to be defined,
sun's header files _require_ a c99 compiler to be used.
Here's the comment that goes along with the partial snippet that you showed
above from /usr/include/sys/feature_tests.h:
/*
* It is invalid to compile an XPG3, XPG4, XPG4v2, or XPG5 application
* using c99. The same is true for POSIX.1-1990, POSIX.2-1992, POSIX.1b,
* and POSIX.1c applications. Likewise, it is invalid to compile an XPG6
* or a POSIX.1-2001 application with anything other than a c99 or later
* compiler. Therefore, we force an error in both cases.
*/
And the rest of the macro implements the check for source/compiler
suitability.
So we either require compiling with a c99 compiler (by ensuring that
_XPG6 is set) or exclude compiling with a c99 compiler on sun (by
ensuring that _XPG6 is not set). Actually, this would only affect Solaris
versions which support XPG6. Solaris 11 and 10 do. I don't know about
Solaris 9 and 8. Solaris 7 doesn't.
Which do we want to do?
> #define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */
> #endif
> +#endif
> #define _ALL_SOURCE 1
> #define _GNU_SOURCE 1
> #define _BSD_SOURCE 1
next prev parent reply other threads:[~2009-05-28 16:47 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-23 19:24 [RFC/PATCH 0/2] OpenSolaris 2008.11 portability fixes Junio C Hamano
2009-05-23 19:24 ` [RFC/PATCH 1/2] Teach Solaris that _XOPEN_SOURCE=600 really menas XPG6 Junio C Hamano
2009-05-23 19:24 ` [RFC/PATCH 2/2] OpenSolaris 200811 (SunOS 5.11) does not want OLD_ICONV Junio C Hamano
2009-05-28 16:46 ` Brandon Casey [this message]
2009-05-28 19:19 ` [RFC/PATCH 1/2] Teach Solaris that _XOPEN_SOURCE=600 really menas XPG6 Jeff King
2009-05-28 19:40 ` Brandon Casey
2009-05-28 19:50 ` Jeff King
2009-05-28 20:37 ` Junio C Hamano
2009-06-11 15:06 ` Tomas Carnecky
2009-06-11 15:50 ` Brandon Casey
2009-06-11 16:42 ` Tomas Carnecky
2009-06-11 17:13 ` Brandon Casey
2009-06-11 17:36 ` Tomas Carnecky
2009-06-11 17:42 ` Brandon Casey
2009-06-11 15:58 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=WLNdjYtfqcg2bT6yOBtAykIqOBTeSLRUdlB6-sTM2KzTjwOmzN3fLg@cipher.nrlssc.navy.mil \
--to=casey@nrlssc.navy.mil \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).