mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[devel] Added -D_ALLSOURCE in configure.ac, makefile.aix, and CMakeLists.txt

Browse Source 
when building on AIX.
This commit is contained in:
Glenn Randers-Pehrson 2010-02-19 12:48:10 -06:00
parent 1beadafcc7
commit 64af5394f5
7 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ANNOUNCE
View File

@ -59,8 +59,9 @@ version 1.5.0beta07 [February 19, 2010]
Noted in scripts/makefile.mingw that it expects to be run under MSYS. Noted in scripts/makefile.mingw that it expects to be run under MSYS.
Removed obsolete unused MMX-querying support from contrib/gregbook Removed obsolete unused MMX-querying support from contrib/gregbook
Added exported png_longjmp() function. Added exported png_longjmp() function.
Added "#ifdef _AIX; #define _ALL_SOURCE 1; #endif" at the top of pngpriv.h, Removed the AIX redefinition of jmpbuf in png.h
otherwise AIX reserves "jmpbuf" and renames it to "__jmpbuf". 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 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

5
CHANGES
View File

@ -2535,8 +2535,9 @@ version 1.5.0beta07 [February 19, 2010]
wherever png_snprintf() is used to construct error and warning messages. wherever png_snprintf() is used to construct error and warning messages.
Removed obsolete unused MMX-querying support from contrib/gregbook Removed obsolete unused MMX-querying support from contrib/gregbook
Added exported png_longjmp() function. Added exported png_longjmp() function.
Added "#ifdef _AIX; #define _ALL_SOURCE 1; #endif" at the top of pngpriv.h, Removed the AIX redefinition of jmpbuf in png.h
otherwise AIX reserves "jmpbuf" and renames it to "__jmpbuf". 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 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

8
configure vendored
View File

@ -11415,7 +11415,13 @@ else
fi 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 LIBPNG_DEFINES=$LIBPNG_DEFINES

8
configure.ac
View File

@ -59,7 +59,13 @@ AC_CHECK_FUNCS([memset], , AC_ERROR([memset not found in libc]))
AC_CHECK_FUNCS([pow], , AC_CHECK_LIB(m, pow, , AC_ERROR([cannot find pow])) ) AC_CHECK_FUNCS([pow], , AC_CHECK_LIB(m, pow, , AC_ERROR([cannot find pow])) )
AC_CHECK_LIB(z, zlibVersion, , AC_ERROR([zlib not installed])) 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 LIBPNG_DEFINES=$LIBPNG_DEFINES
AC_SUBST(LIBPNG_DEFINES) AC_SUBST(LIBPNG_DEFINES)

4
png.h
View File

@ -390,10 +390,6 @@
#include "zlib.h" #include "zlib.h"
#endif #endif
#ifdef AIX
#define jmpbuf __jmpbuf
#endif
/* Include all user configurable info, including optional assembler routines */ /* Include all user configurable info, including optional assembler routines */
#include "pngconf.h" #include "pngconf.h"

5
pngconf.h
View File

@ -22,11 +22,6 @@
#ifndef PNGCONF_H #ifndef PNGCONF_H
#define PNGCONF_H #define PNGCONF_H
/* Added at libpng-1.2.43 */
#ifdef _AIX
#define _ALL_SOURCE 1
#endif
#ifndef PNG_NO_LIMITS_H #ifndef PNG_NO_LIMITS_H
# include <limits.h> # include <limits.h>
#endif #endif

2
scripts/makefile.aix
View File

@ -46,7 +46,7 @@ LDDEBUG =
CRELEASE = -O2 CRELEASE = -O2
LDRELEASE = -s LDRELEASE = -s
WARNMORE=-W -Wall WARNMORE=-W -Wall
CFLAGS = -I$(ZLIBINC) $(WARNMORE) $(CRELEASE) CFLAGS = -D_ALLSOURCE -I$(ZLIBINC) $(WARNMORE) $(CRELEASE)
LDFLAGS = -L. -L$(ZLIBLIB) -lpng15 -lz -lm $(LDRELEASE) LDFLAGS = -L. -L$(ZLIBLIB) -lpng15 -lz -lm $(LDRELEASE)
# File extensions # File extensions