[master] Define _ALLSOURCE in pngconf.h when building with nonANSI AIX compiler.

otherwise AIX reserves "jmpbuf" and renames it to "__jmpbuf".
This commit is contained in:
Glenn Randers-Pehrson 2010-02-19 10:57:58 -06:00
parent d207e6a6ad
commit 93d6d9d835
8 changed files with 58 additions and 40 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.4.1rc02 - February 18, 2010
Libpng 1.4.1rc03 - February 19, 2010
This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version.
@ -9,20 +9,20 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
1.4.1rc02.tar.xz (LZMA-compressed, recommended)
1.4.1rc02.tar.gz
1.4.1rc02.tar.bz2
1.4.1rc03.tar.xz (LZMA-compressed, recommended)
1.4.1rc03.tar.gz
1.4.1rc03.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
lp141r02.zip
lp141r02.7z
lp141r03.zip
lp141r03.7z
Other information:
1.4.1rc02-README.txt
1.4.1rc02-LICENSE.txt
1.4.1rc03-README.txt
1.4.1rc03-LICENSE.txt
Changes since the last public release (1.4.0):
@ -82,13 +82,19 @@ version 1.4.1beta11 [February 12, 2010]
Relocated misplaced closing curley bracket in png_decompress_chunk().
Complete rewrite of two-pass png_decompress_chunk() by John Bowler.
version 1.4.1beta12 [February 18, 2010]
version 1.4.1beta12 [February 14, 2010]
Fixed type declaration of png_get_user_malloc_max() in pngget.c (Daisuke
Nishikawa)
version 1.4.1rc02 [February 18, 2010]
No changes.
version 1.4.1rc03 [February 19, 2010]
Noted in scripts/makefile.mingw that it expects to be run under MSYS.
Removed obsolete unused MMX-querying support from contrib/gregbook
Removed the AIX redefinition of jmpbuf in png.h
Define _ALLSOURCE in pngconf.h when building with nonANSI AIX compiler.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement

View File

@ -2519,9 +2519,15 @@ version 1.4.1beta12 [February 14, 2010]
Fixed type declaration of png_get_user_malloc_max() in pngget.c (Daisuke
Nishikawa)
version 1.4.1rc02 [February 18, 2010]
version 1.4.1rc02 [January 18, 2010]
No changes.
version 1.4.1rc03 [February 19, 2010]
Noted in scripts/makefile.mingw that it expects to be run under MSYS.
Removed obsolete unused MMX-querying support from contrib/gregbook
Removed the AIX redefinition of jmpbuf in png.h
Define _ALLSOURCE in pngconf.h when building with nonANSI AIX compiler.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement

View File

@ -209,7 +209,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in
# SET UP LINKS
if(PNG_SHARED)
set_target_properties(${PNG_LIB_NAME} PROPERTIES
# VERSION 14.${PNGLIB_RELEASE}.1.4.1rc02
# VERSION 14.${PNGLIB_RELEASE}.1.4.1rc03
VERSION 14.${PNGLIB_RELEASE}.0
SOVERSION 14
CLEAN_DIRECT_OUTPUT 1)

22
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for libpng 1.4.1rc02.
# Generated by GNU Autoconf 2.65 for libpng 1.4.1rc03.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
@ -701,8 +701,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
PACKAGE_VERSION='1.4.1rc02'
PACKAGE_STRING='libpng 1.4.1rc02'
PACKAGE_VERSION='1.4.1rc03'
PACKAGE_STRING='libpng 1.4.1rc03'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
PACKAGE_URL=''
@ -1432,7 +1432,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures libpng 1.4.1rc02 to adapt to many kinds of systems.
\`configure' configures libpng 1.4.1rc03 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1502,7 +1502,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libpng 1.4.1rc02:";;
short | recursive ) echo "Configuration of libpng 1.4.1rc03:";;
esac
cat <<\_ACEOF
@ -1607,7 +1607,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libpng configure 1.4.1rc02
libpng configure 1.4.1rc03
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@ -2032,7 +2032,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by libpng $as_me 1.4.1rc02, which was
It was created by libpng $as_me 1.4.1rc03, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@ -2840,7 +2840,7 @@ fi
# Define the identity of the package.
PACKAGE='libpng'
VERSION='1.4.1rc02'
VERSION='1.4.1rc03'
cat >>confdefs.h <<_ACEOF
@ -2904,7 +2904,7 @@ fi
PNGLIB_VERSION=1.4.1rc02
PNGLIB_VERSION=1.4.1rc03
PNGLIB_MAJOR=1
PNGLIB_MINOR=4
PNGLIB_RELEASE=1
@ -12027,7 +12027,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by libpng $as_me 1.4.1rc02, which was
This file was extended by libpng $as_me 1.4.1rc03, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -12093,7 +12093,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
libpng config.status 1.4.1rc02
libpng config.status 1.4.1rc03
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"

View File

@ -18,12 +18,12 @@ AC_PREREQ(2.59)
dnl Version number stuff here:
AC_INIT([libpng], [1.4.1rc02], [png-mng-implement@lists.sourceforge.net])
AC_INIT([libpng], [1.4.1rc03], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
PNGLIB_VERSION=1.4.1rc02
PNGLIB_VERSION=1.4.1rc03
PNGLIB_MAJOR=1
PNGLIB_MINOR=4
PNGLIB_RELEASE=1

24
png.h
View File

@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
* libpng version 1.4.1rc02 - February 18, 2010
* libpng version 1.4.1rc03 - February 19, 2010
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@ -11,7 +11,7 @@
* Authors and maintainers:
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
* libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
* libpng versions 0.97, January 1998, through 1.4.1rc02 - February 18, 2010: Glenn
* libpng versions 0.97, January 1998, through 1.4.1rc03 - February 19, 2010: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@ -137,7 +137,7 @@
* 1.4.1beta01-03 14 10401 14.so.14.1[.0]
* 1.4.1rc01 14 10401 14.so.14.1[.0]
* 1.4.1beta04-12 14 10401 14.so.14.1[.0]
* 1.4.1rc02 14 10401 14.so.14.1[.0]
* 1.4.1rc02-03 14 10401 14.so.14.1[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@ -169,7 +169,7 @@
*
* This code is released under the libpng license.
*
* libpng versions 1.2.6, August 15, 2004, through 1.4.1rc02, February 18, 2010, are
* libpng versions 1.2.6, August 15, 2004, through 1.4.1rc03, February 19, 2010, are
* Copyright (c) 2004, 2006-2010 Glenn Randers-Pehrson, and are
* distributed according to the same disclaimer and license as libpng-1.2.5
* with the following individual added to the list of Contributing Authors:
@ -281,13 +281,13 @@
* Y2K compliance in libpng:
* =========================
*
* February 18, 2010
* February 19, 2010
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
*
* This is your unofficial assurance that libpng from version 0.71 and
* upward through 1.4.1rc02 are Y2K compliant. It is my belief that earlier
* upward through 1.4.1rc03 are Y2K compliant. It is my belief that earlier
* versions were also Y2K compliant.
*
* Libpng only has three year fields. One is a 2-byte unsigned integer
@ -343,9 +343,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.4.1rc02"
#define PNG_LIBPNG_VER_STRING "1.4.1rc03"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.4.1rc02 - February 18, 2010\n"
" libpng version 1.4.1rc03 - February 19, 2010\n"
#define PNG_LIBPNG_VER_SONUM 14
#define PNG_LIBPNG_VER_DLLNUM 14
@ -358,7 +358,7 @@
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
*/
#define PNG_LIBPNG_VER_BUILD 02
#define PNG_LIBPNG_VER_BUILD 03
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@ -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"
@ -1471,7 +1467,7 @@ struct png_struct_def
/* This triggers a compiler error in png.c, if png.c and png.h
* do not agree upon the version number.
*/
typedef png_structp version_1_4_1rc02;
typedef png_structp version_1_4_1rc03;
typedef png_struct FAR * FAR * png_structpp;

View File

@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
* libpng version 1.4.1rc02 - February 18, 2010
* libpng version 1.4.1rc03 - February 19, 2010
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@ -22,6 +22,16 @@
#ifndef PNGCONF_H
#define PNGCONF_H
/* Added at libpng-1.4.1 */
#if ((defined(_AIX)) && \
(!defined (_XOPEN_SOURCE)) && \
(!defined (_POSIX_SOURCE)) && \
(!defined (_ANSI_C_SOURCE)))
# ifndef _ALL_SOURCE
# define _ALL_SOURCE
# endif
#endif
#ifndef PNG_NO_LIMITS_H
# include <limits.h>
#endif

View File

@ -1,7 +1,7 @@
/* pngpriv.h - private declarations for use inside libpng
*
* libpng version 1.4.1rc02 - February 18, 2010
* libpng version 1.4.1rc03 - February 19, 2010
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)