diff options
-rw-r--r-- | buildtools/libopt.c | 2 | ||||
-rw-r--r-- | doc/HISTORY | 3 | ||||
-rw-r--r-- | lib/colorname.c | 2 | ||||
-rw-r--r-- | lib/libpam.c | 2 | ||||
-rw-r--r-- | lib/libpamcolor.c | 2 | ||||
-rw-r--r-- | lib/libpm.c | 2 | ||||
-rw-r--r-- | lib/libppmcolor.c | 2 | ||||
-rw-r--r-- | lib/pmfileio.c | 2 |
8 files changed, 10 insertions, 7 deletions
diff --git a/buildtools/libopt.c b/buildtools/libopt.c index a0bf1cda..04b8cec6 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 500 /* Make sure strdup() is in string.h */ +#define _XOPEN_SOURCE 600 /* Make sure strdup() is in string.h */ #define MAX_PREFIXES 10 diff --git a/doc/HISTORY b/doc/HISTORY index f4f575b7..3bc0aead 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -15,6 +15,9 @@ not yet BJH Release 10.60.00 pamtosrf: fix storage corruption. Always broken (program added in 10.55 (June 2011). + Build: change _XOPEN_SOURCE 500 to 600 because on a Mac OSX 10.8 + system, this is necessary to get 'strdup' into <strings.h>. + Build: rename getline() in xpmtoppm.c to avoid collision with some libc. Always broken. diff --git a/lib/colorname.c b/lib/colorname.c index 20b000e6..11df31c8 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 500 /* Make sure strdup() is in string.h */ +#define _XOPEN_SOURCE 600 /* 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 1f58aa7b..601188c8 100644 --- a/lib/libpam.c +++ b/lib/libpam.c @@ -11,7 +11,7 @@ #define _FILE_OFFSET_BITS 64 #define _LARGE_FILES #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ -#define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ +#define _XOPEN_SOURCE 600 /* Make sure strdup() is in string.h */ #include <string.h> #include <limits.h> diff --git a/lib/libpamcolor.c b/lib/libpamcolor.c index b64f8963..8604e15e 100644 --- a/lib/libpamcolor.c +++ b/lib/libpamcolor.c @@ -12,7 +12,7 @@ #define _LARGE_FILES #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ -#define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ +#define _XOPEN_SOURCE 600 /* Make sure strdup() is in string.h */ #include <string.h> #include <limits.h> diff --git a/lib/libpm.c b/lib/libpm.c index 9534b53a..6bc8521c 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 500 /* Make sure ftello, fseeko are defined */ +#define _XOPEN_SOURCE 600 /* Make sure ftello, fseeko are defined */ #include "netpbm/pm_config.h" diff --git a/lib/libppmcolor.c b/lib/libppmcolor.c index 36eb7a3f..3e7bf27c 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 500 /* Make sure strdup() is in string.h */ +#define _XOPEN_SOURCE 600 /* Make sure strdup() is in string.h */ #include <assert.h> #include <stdlib.h> diff --git a/lib/pmfileio.c b/lib/pmfileio.c index ab1fcd32..82b44cdb 100644 --- a/lib/pmfileio.c +++ b/lib/pmfileio.c @@ -10,7 +10,7 @@ does it in other libc's). pm_config.h defines TMPDIR as P_tmpdir in some environments. */ -#define _XOPEN_SOURCE 500 /* Make sure ftello, fseeko are defined */ +#define _XOPEN_SOURCE 600 /* Make sure ftello, fseeko are defined */ #define _LARGEFILE_SOURCE 1 /* Make sure ftello, fseeko are defined */ #define _LARGEFILE64_SOURCE 1 #define _FILE_OFFSET_BITS 64 |