Change _XOPEN_SOURCE 600 to 500. See doc/HISTORY

git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2285 9d0c8265-081b-0410-96cb-a4ca84ce46f8

8 files changed, 20 insertions, 7 deletions

diff --git a/buildtools/libopt.c b/buildtools/libopt.c
index 04b8cec6..a0bf1cda 100644
--- a/buildtools/libopt.c
+++ b/buildtools/libopt.c
@@ -66,7 +66,7 @@
 
 -----------------------------------------------------------------------------*/
 #define _BSD_SOURCE 1      /* Make sure strdup() is in stdio.h */
-#define _XOPEN_SOURCE 600  /* Make sure strdup() is in string.h */
+#define _XOPEN_SOURCE 500  /* Make sure strdup() is in string.h */
 
 #define MAX_PREFIXES 10
 
diff --git a/doc/HISTORY b/doc/HISTORY
index 8dd42285..635a3942 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -29,6 +29,19 @@ not yet  BJH  Release 10.68.00
               systems.  Always broken (pcdovtoppm was new sometime between
               Netpbm 9.25 (March 2002) and Netpbm 10.11 (Februrary 2010)).
 
+              Build: change _XOPEN_SOURCE from 600 back to 500 in 7 files.  It
+              was changed from 500 to 600 in Subversion revision 1731 in
+              Netpbm 10.60 (September 2012) because that made a similar
+              version of Netpbm compile on Mac OSX.  Without it, strdup did
+              not get defined.  But this is apparently a bug in Mac OSX, since
+              X/Open 500 does have strdup.  Furthermore, many other Netpbm
+              files use strdup and apparently compile OK on Mac OSX without
+              600.  Finally, we have a report now that on SunOS with a non-C99
+              compiler, _XOPEN_SOURCE 600 actually removes things from libc
+              that these files need (no details).  So we will go back to 500
+              and if the problem on Mac OSX gets reported again, we will look
+              more deeply.
+
               Build: fix undefined symbols in fiasco converters with
               static libraries.
 
diff --git a/lib/colorname.c b/lib/colorname.c
index 454cf195..c23eb13f 100644
--- a/lib/colorname.c
+++ b/lib/colorname.c
@@ -13,7 +13,7 @@
 */
 
 #define _BSD_SOURCE 1      /* Make sure strdup() is in string.h */
-#define _XOPEN_SOURCE 600  /* Make sure strdup() is in string.h */
+#define _XOPEN_SOURCE 500  /* Make sure strdup() is in string.h */
 
 #include "pm_c_util.h"
 #include <ctype.h>
diff --git a/lib/libpam.c b/lib/libpam.c
index f188f7d6..2d82ffef 100644
--- a/lib/libpam.c
+++ b/lib/libpam.c
@@ -14,7 +14,7 @@
 #define _FILE_OFFSET_BITS 64
 #define _LARGE_FILES  
 #define _BSD_SOURCE 1      /* Make sure strdup() is in string.h */
-#define _XOPEN_SOURCE 600  /* Make sure strdup() is in string.h */
+#define _XOPEN_SOURCE 500  /* Make sure strdup() is in string.h */
 
 #include <string.h>
 #include <limits.h>
diff --git a/lib/libpamcolor.c b/lib/libpamcolor.c
index c4f2212d..f945c0a5 100644
--- a/lib/libpamcolor.c
+++ b/lib/libpamcolor.c
@@ -15,7 +15,7 @@
 #define _LARGE_FILES  
 
 #define _BSD_SOURCE 1      /* Make sure strdup() is in string.h */
-#define _XOPEN_SOURCE 600  /* Make sure strdup() is in string.h */
+#define _XOPEN_SOURCE 500  /* Make sure strdup() is in string.h */
 
 #include <string.h>
 #include <limits.h>
diff --git a/lib/libpm.c b/lib/libpm.c
index 93203f1e..228f42c6 100644
--- a/lib/libpm.c
+++ b/lib/libpm.c
@@ -9,7 +9,7 @@
 **************************************************************************/
 
 #define _BSD_SOURCE          /* Make sure strdup is in string.h */
-#define _XOPEN_SOURCE 600    /* Make sure ftello, fseeko are defined */
+#define _XOPEN_SOURCE 500    /* Make sure ftello, fseeko are defined */
 
 #include "netpbm/pm_config.h"
 
diff --git a/lib/libppmcolor.c b/lib/libppmcolor.c
index 347bab29..3d98f5e7 100644
--- a/lib/libppmcolor.c
+++ b/lib/libppmcolor.c
@@ -10,7 +10,7 @@
 */
 
 #define _BSD_SOURCE 1      /* Make sure strdup() is in string.h */
-#define _XOPEN_SOURCE 600  /* Make sure strdup() is in string.h */
+#define _XOPEN_SOURCE 500  /* Make sure strdup() is in string.h */
 
 #include <assert.h>
 #include <stdlib.h>
diff --git a/lib/pmfileio.c b/lib/pmfileio.c
index 908e793a..b629fd23 100644
--- a/lib/pmfileio.c
+++ b/lib/pmfileio.c
@@ -11,7 +11,7 @@
        in some environments.
     */
 #define _BSD_SOURCE    /* Make sure strdup is defined */
-#define _XOPEN_SOURCE 600    /* Make sure ftello, fseeko, strdup are defined */
+#define _XOPEN_SOURCE 500    /* Make sure ftello, fseeko, strdup are defined */
 #define _LARGEFILE_SOURCE 1  /* Make sure ftello, fseeko are defined */
 #define _LARGEFILE64_SOURCE 1 
 #define _FILE_OFFSET_BITS 64