[master] Moved the definition of the new PNG_USED macro into pngconf.h

It really belongs in pngpriv.h and will be moved there in libpng-1.5.x
This commit is contained in:
Glenn Randers-Pehrson 2011-03-14 12:49:20 -05:00
parent 603c9fd959
commit 8502e1ff25
3 changed files with 18 additions and 6 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.4.6beta06 - March 8, 2011 Libpng 1.4.6beta06 - March 14, 2011
This is not intended to be a public release. It will be replaced 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. within a few weeks by a public version or by another test version.
@ -49,9 +49,9 @@ version 1.4.6beta05 [January 23, 2011]
Fixed a typo in the *.def files and deleted entries that are now Fixed a typo in the *.def files and deleted entries that are now
declared in pngpriv.h declared in pngpriv.h
version 1.4.6beta06 [March 8, 2011] version 1.4.6beta06 [March 14, 2011]
Updated contrib/pngsuite/README to add the word "modify". Updated contrib/pngsuite/README to add the word "modify".
Added the private PNG_UNUSED() macro definition in pngpriv.h. Added the private PNG_UNUSED() macro definition in pngconf.h.
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

@ -2761,9 +2761,9 @@ version 1.4.6beta05 [January 23, 2011]
Fixed a typo in the *.def files and deleted entries that are now Fixed a typo in the *.def files and deleted entries that are now
declared in pngpriv.h declared in pngpriv.h
version 1.4.6beta06 [March 8, 2011] version 1.4.6beta06 [March 14, 2011]
Updated contrib/pngsuite/README to add the word "modify". Updated contrib/pngsuite/README to add the word "modify".
Added the private PNG_UNUSED() macro definition in pngpriv.h. Added the private PNG_UNUSED() macro definition in pngconf.h.
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

@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng /* pngconf.h - machine configurable file for libpng
* *
* libpng version 1.4.6beta06 - January 23, 2011 * libpng version 1.4.6beta06 - March 14, 2011
* For conditions of distribution and use, see copyright notice in png.h * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2011 Glenn Randers-Pehrson * Copyright (c) 1998-2011 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@ -84,6 +84,18 @@
/* End of material added to libpng-1.2.8 */ /* End of material added to libpng-1.2.8 */
/* Added at libpng-1.4.6 */
#ifndef PNG_UNUSED
/* Unused formal parameter warnings are silenced using the following macro
* which is expected to have no bad effects on performance (optimizing
* compilers will probably remove it entirely). Note that if you replace
* it with something other than whitespace, you must include the terminating
* semicolon.
*/
# define PNG_UNUSED(param) (void)param;
#endif
/* End of material added to libpng-1.4.6 */
#ifndef PNG_VERSION_INFO_ONLY #ifndef PNG_VERSION_INFO_ONLY
/* This is the size of the compression buffer, and thus the size of /* This is the size of the compression buffer, and thus the size of