From 355b90387b1ec28fafb30b3004578bebef23ccdf Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 2 May 2011 12:29:20 -0500 Subject: [PATCH] [master] Undef "_ALL_SOURCE" for AIX, to prevent "jmpbuf" from being redefined. --- ANNOUNCE | 9 +++------ CHANGES | 4 +++- pngpriv.h | 9 +++++++++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index f342df566..cfd1897ee 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -24,13 +24,10 @@ Other information: 1.4.8beta01-README.txt 1.4.8beta01-LICENSE.txt -Changes since the last public release (1.4.6): +Changes since the last public release (1.4.7): -version 1.4.7rc01 [April 9, 2010] - Relocated misplaced new declarations in pngwutil.c. -` -version 1.4.7 [May 2, 2011] - Disabled PNG_PEDANTIC_WARNINGS for all MSC versions as in libpng-1.4.5. +version 1.4.8beta01 [May 2, 2011] + Undef "_ALL_SOURCE" for AIX, to prevent "jmpbuf" from being redefined. Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 6e0007003..f9da2b606 100644 --- a/CHANGES +++ b/CHANGES @@ -2791,9 +2791,11 @@ version 1.4.6 [April 8, 2011] version 1.4.7rc01 [April 9, 2011] Relocated misplaced new declarations in pngwutil.c. -version 1.4.7 [May 2, 2011] +version 1.4.7 [April 9, 2011] Disabled PNG_PEDANTIC_WARNINGS for all MSC versions as in libpng-1.4.5. +version 1.4.8beta01 [May 2, 2011] + Undef "_ALL_SOURCE" for AIX, to prevent "jmpbuf" from being redefined. Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/pngpriv.h b/pngpriv.h index f61146d7f..df59d5a20 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -26,6 +26,15 @@ #ifndef PNG_VERSION_INFO_ONLY +#if defined(_AIX) && defined(_ALL_SOURCE) + /* On AIX if _ALL_SOURCE is defined standard header files (including + * stdlib.h) define identifiers that are not permitted by the ANSI and + * POSIX standards. In particular 'jmpbuf' is #defined and this will + * prevent compilation of libpng. The following prevents this: + */ +# undef _ALL_SOURCE +#endif + #include #ifndef PNG_EXTERN