From: Matthias Dieter Wallnöfer <mdw@samba.org>
Date: Sat, 11 Sep 2010 14:50:47 +0000 (+0200)
Subject: lib/replace/wscript:Tru64 build - Better use version 600 for _XOPEN_SOURCE
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=ea3f21dff6c28dc26a3cf9223da84ff4c545b22c;p=mat%2Fsamba.git

lib/replace/wscript:Tru64 build - Better use version 600 for _XOPEN_SOURCE

This means we request the "Single UNIX Specification, Version 3" with C99
compatibility as the Python 2.5 release on the system. This prevents
redefinitions with different values.

> [ 451/1918] Compiling scripting/python/pyglue.c
> cc: Warning: /usr/local/include/python2.5/pyconfig.h, line 951: The redefinition of the macro "_XOPEN_SOURCE" conflicts with a current definition because the replacement lists differ.  The redefinition is now in effect. (macroredef)
> #define _XOPEN_SOURCE 600
> ----------------------^
> cc: Warning: default/source4/include/config.h, line 54: The redefinition of the macro "_XOPEN_SOURCE" conflicts with a current definition because the replacement lists differ.  The redefinition is now in effect. (macroredef)
> #define _XOPEN_SOURCE 500
> ----------------------^
---

diff --git a/lib/replace/wscript b/lib/replace/wscript
index e626eeb22a..fef366317c 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -30,10 +30,10 @@ def configure(conf):
     conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1)
 
     # on Tru64 certain features are only available with _OSF_SOURCE set to 1
-    # and _XOPEN_SOURCE set to 500
+    # and _XOPEN_SOURCE set to 600
     if conf.env['SYSTEM_UNAME_SYSNAME'] == 'OSF1':
         conf.DEFINE('_OSF_SOURCE', 1, add_to_cflags=True)
-        conf.DEFINE('_XOPEN_SOURCE', 500, add_to_cflags=True)
+        conf.DEFINE('_XOPEN_SOURCE', 600, add_to_cflags=True)
 
     conf.CHECK_HEADERS('crypt.h locale.h acl/libacl.h compat.h')
     conf.CHECK_HEADERS('acl/libacl.h attr/xattr.h compat.h ctype.h dustat.h')