[master] Removed test for PNG_CONFIGURE_LIBPNG from pngconf.h
This commit is contained in:
parent
de5c932283
commit
eaa1b0a5f2
12
pngconf.h
12
pngconf.h
@ -1534,7 +1534,7 @@ typedef z_stream FAR * png_zstreamp;
|
|||||||
* functions in png.h will generate compiler warnings. Added at libpng
|
* functions in png.h will generate compiler warnings. Added at libpng
|
||||||
* version 1.2.41.
|
* version 1.2.41.
|
||||||
*/
|
*/
|
||||||
#ifdef __GNUC__
|
# ifdef __GNUC__
|
||||||
# ifndef PNG_USE_RESULT
|
# ifndef PNG_USE_RESULT
|
||||||
# define PNG_USE_RESULT __attribute__((__warn_unused_result__))
|
# define PNG_USE_RESULT __attribute__((__warn_unused_result__))
|
||||||
# endif
|
# endif
|
||||||
@ -1545,7 +1545,6 @@ typedef z_stream FAR * png_zstreamp;
|
|||||||
# define PNG_ALLOCATED __attribute__((__malloc__))
|
# define PNG_ALLOCATED __attribute__((__malloc__))
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
# ifndef PNG_CONFIGURE_LIBPNG
|
|
||||||
/* This specifically protects structure members that should only be
|
/* This specifically protects structure members that should only be
|
||||||
* accessed from within the library, therefore should be empty during
|
* accessed from within the library, therefore should be empty during
|
||||||
* a library build.
|
* a library build.
|
||||||
@ -1557,16 +1556,15 @@ typedef z_stream FAR * png_zstreamp;
|
|||||||
# define PNG_DEPSTRUCT __attribute__((__deprecated__))
|
# define PNG_DEPSTRUCT __attribute__((__deprecated__))
|
||||||
# endif
|
# endif
|
||||||
# ifndef PNG_PRIVATE
|
# ifndef PNG_PRIVATE
|
||||||
#if 0 /* Doesn't work so we use deprecated instead*/
|
# if 0 /* Doesn't work so we use deprecated instead*/
|
||||||
# define PNG_PRIVATE \
|
# define PNG_PRIVATE \
|
||||||
__attribute__((warning("This function is not exported by libpng.")))
|
__attribute__((warning("This function is not exported by libpng.")))
|
||||||
#else
|
# else
|
||||||
# define PNG_PRIVATE \
|
# define PNG_PRIVATE \
|
||||||
__attribute__((__deprecated__))
|
__attribute__((__deprecated__))
|
||||||
#endif
|
|
||||||
# endif
|
# endif
|
||||||
# endif
|
# endif /* PNG_PRIVATE */
|
||||||
#endif
|
# endif /* __GNUC__ */
|
||||||
#endif /* PNG_PEDANTIC_WARNINGS */
|
#endif /* PNG_PEDANTIC_WARNINGS */
|
||||||
|
|
||||||
#ifndef PNG_DEPRECATED
|
#ifndef PNG_DEPRECATED
|
||||||
|
Reference in New Issue
Block a user