[master] Undef "_ALL_SOURCE" for AIX, to prevent "jmpbuf" from being redefined.

This commit is contained in:
Glenn Randers-Pehrson 2011-05-02 12:29:20 -05:00
parent f512ca7625
commit 355b90387b
3 changed files with 15 additions and 7 deletions

View File

@ -24,13 +24,10 @@ Other information:
1.4.8beta01-README.txt 1.4.8beta01-README.txt
1.4.8beta01-LICENSE.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] version 1.4.8beta01 [May 2, 2011]
Relocated misplaced new declarations in pngwutil.c. Undef "_ALL_SOURCE" for AIX, to prevent "jmpbuf" from being redefined.
`
version 1.4.7 [May 2, 2011]
Disabled PNG_PEDANTIC_WARNINGS for all MSC versions as in libpng-1.4.5.
Send comments/corrections/commendations to glennrp at users.sourceforge.net Send comments/corrections/commendations to glennrp at users.sourceforge.net
or to png-mng-implement at lists.sf.net (subscription required; visit or to png-mng-implement at lists.sf.net (subscription required; visit

View File

@ -2791,9 +2791,11 @@ version 1.4.6 [April 8, 2011]
version 1.4.7rc01 [April 9, 2011] version 1.4.7rc01 [April 9, 2011]
Relocated misplaced new declarations in pngwutil.c. 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. 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 Send comments/corrections/commendations to glennrp at users.sourceforge.net
or to png-mng-implement at lists.sf.net (subscription required; visit or to png-mng-implement at lists.sf.net (subscription required; visit

View File

@ -26,6 +26,15 @@
#ifndef PNG_VERSION_INFO_ONLY #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 <stdlib.h> #include <stdlib.h>
#ifndef PNG_EXTERN #ifndef PNG_EXTERN