[devel] Added -D_ALLSOURCE in configure.ac, makefile.aix, and CMakeLists.txt
when building on AIX.
diff --git a/ANNOUNCE b/ANNOUNCE
index 6403ba7..c473b07 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -59,8 +59,9 @@
Noted in scripts/makefile.mingw that it expects to be run under MSYS.
Removed obsolete unused MMX-querying support from contrib/gregbook
Added exported png_longjmp() function.
- Added "#ifdef _AIX; #define _ALL_SOURCE 1; #endif" at the top of pngpriv.h,
- otherwise AIX reserves "jmpbuf" and renames it to "__jmpbuf".
+ Removed the AIX redefinition of jmpbuf in png.h
+ Added -D_ALLSOURCE in configure.ac, makefile.aix, and CMakeLists.txt
+ when building on AIX.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/CHANGES b/CHANGES
index 574ee4f..495bb07 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2535,8 +2535,9 @@
wherever png_snprintf() is used to construct error and warning messages.
Removed obsolete unused MMX-querying support from contrib/gregbook
Added exported png_longjmp() function.
- Added "#ifdef _AIX; #define _ALL_SOURCE 1; #endif" at the top of pngpriv.h,
- otherwise AIX reserves "jmpbuf" and renames it to "__jmpbuf".
+ Removed the AIX redefinition of jmpbuf in png.h
+ Added -D_ALLSOURCE in configure.ac, makefile.aix, and CMakeLists.txt
+ when building on AIX.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/configure b/configure
index 4959ec4..fe9565c 100755
--- a/configure
+++ b/configure
@@ -11415,7 +11415,13 @@
fi
-LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG
+case $host_os in
+ aix*)
+ LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG -D_ALLSOURCE;;
+ *)
+ LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG;;
+esac
+endif
LIBPNG_DEFINES=$LIBPNG_DEFINES
diff --git a/configure.ac b/configure.ac
index 339020a..ead43df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,13 @@
AC_CHECK_FUNCS([pow], , AC_CHECK_LIB(m, pow, , AC_ERROR([cannot find pow])) )
AC_CHECK_LIB(z, zlibVersion, , AC_ERROR([zlib not installed]))
-LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG
+case $host_os in
+ aix*)
+ LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG -D_ALLSOURCE;;
+ *)
+ LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG;;
+esac
+endif
LIBPNG_DEFINES=$LIBPNG_DEFINES
AC_SUBST(LIBPNG_DEFINES)
diff --git a/png.h b/png.h
index f2384f1..517d0cd 100644
--- a/png.h
+++ b/png.h
@@ -390,10 +390,6 @@
#include "zlib.h"
#endif
-#ifdef AIX
-#define jmpbuf __jmpbuf
-#endif
-
/* Include all user configurable info, including optional assembler routines */
#include "pngconf.h"
diff --git a/pngconf.h b/pngconf.h
index 2734365..55e225e 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -22,11 +22,6 @@
#ifndef PNGCONF_H
#define PNGCONF_H
-/* Added at libpng-1.2.43 */
-#ifdef _AIX
-#define _ALL_SOURCE 1
-#endif
-
#ifndef PNG_NO_LIMITS_H
# include <limits.h>
#endif
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index 19c341c..6e5d6a3 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -46,7 +46,7 @@
CRELEASE = -O2
LDRELEASE = -s
WARNMORE=-W -Wall
-CFLAGS = -I$(ZLIBINC) $(WARNMORE) $(CRELEASE)
+CFLAGS = -D_ALLSOURCE -I$(ZLIBINC) $(WARNMORE) $(CRELEASE)
LDFLAGS = -L. -L$(ZLIBLIB) -lpng15 -lz -lm $(LDRELEASE)
# File extensions
