diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-09-20 18:34:38 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-09-20 18:34:38 +0000 |
| commit | 1d81438b24932cd789b3cd3398129a12e2dfef3e (patch) | |
| tree | 800d02b6ad4acded63faa97ffdf9c5feec6347f7 | |
| parent | bc5e1a952c7f5758d92e0dc2dbd38b25d0aead5f (diff) | |
| download | netpbm-mirror-1d81438b24932cd789b3cd3398129a12e2dfef3e.tar.gz netpbm-mirror-1d81438b24932cd789b3cd3398129a12e2dfef3e.tar.xz netpbm-mirror-1d81438b24932cd789b3cd3398129a12e2dfef3e.zip | |
Change _XOPEN_SOURCE 600 to 500
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2287 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | converter/other/jpeg2000/jpeg2ktopam.c | 9 | ||||
| -rw-r--r-- | converter/other/jpeg2000/pamtojpeg2k.c | 10 | ||||
| -rw-r--r-- | doc/HISTORY | 7 |
3 files changed, 22 insertions, 4 deletions
diff --git a/converter/other/jpeg2000/jpeg2ktopam.c b/converter/other/jpeg2000/jpeg2ktopam.c index 858c0fa4..405de9c9 100644 --- a/converter/other/jpeg2000/jpeg2ktopam.c +++ b/converter/other/jpeg2000/jpeg2ktopam.c @@ -9,8 +9,13 @@ *****************************************************************************/ #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ -/* Make sure strdup() is in string.h and int_fast32_t is in inttypes.h */ -#define _XOPEN_SOURCE 600 +#define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ + /* In 2014.09, this was _XOPEN_SOURCE 600, with a comment saying it was + necessary to make <inttypes.h> define int_fast32_t, etc. on AIX. + <jasper/jasper.h> does use int_fast32_t and does include <inttypes.h>, + but plenty of source files of libjasper do to0, and they did not have + _XOPEN_SOURCE 600, so it would seem to be superfluous here too. + */ #include <string.h> #include <jasper/jasper.h> diff --git a/converter/other/jpeg2000/pamtojpeg2k.c b/converter/other/jpeg2000/pamtojpeg2k.c index 349018e1..b8905518 100644 --- a/converter/other/jpeg2000/pamtojpeg2k.c +++ b/converter/other/jpeg2000/pamtojpeg2k.c @@ -9,8 +9,14 @@ *****************************************************************************/ #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ -/* Make sure strdup() is in string.h and int_fast32_t is in inttypes.h */ -#define _XOPEN_SOURCE 600 +#define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ + /* In 2014.09, this was _XOPEN_SOURCE 600, with a comment saying it was + necessary to make <inttypes.h> define int_fast32_t, etc. on AIX. + <jasper/jasper.h> does use int_fast32_t and does include <inttypes.h>, + but plenty of source files of libjasper do too, and they did not have + _XOPEN_SOURCE 600, so it would seem to be superfluous here too. + */ + #include <string.h> #include <jasper/jasper.h> diff --git a/doc/HISTORY b/doc/HISTORY index ae99cd46..405d0a4c 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -41,6 +41,13 @@ not yet BJH Release 10.68.00 _XOPEN_SOURCE is 600. So we go back to 500 and if the problem on Mac OSX gets reported again, we will look more deeply. + Build: change _XOPEN_SOURCE from 600 back to 500 in + jpeg2ktopam.c and pamtojpeg2k.c. It was changed from 500 to 600 + in Netpbm 10.41 (December 2007), reportedly to get int_fast32_t, + etc. defined on AIX, but other files that use int_fast32_t + don't have it today, so that must be wrong. See above for the + drawback of 600. + Build: fix undefined symbols in fiasco converters with static libraries. |