mirror of
https://git.code.sf.net/p/libpng/code.git
synced 2025-07-10 18:04:09 +02:00
Deprecate PNGARG and remove all of its remaining uses
This commit is contained in:
parent
68ba4f1f7d
commit
1964d560e9
2
png.h
2
png.h
@ -824,7 +824,7 @@ typedef PNG_CALLBACK(int, *png_user_chunk_ptr, (png_structp,
|
|||||||
* your compiler. This may be very difficult - try using a different compiler
|
* your compiler. This may be very difficult - try using a different compiler
|
||||||
* to build the library!
|
* to build the library!
|
||||||
*/
|
*/
|
||||||
PNG_FUNCTION(void, (PNGCAPI *png_longjmp_ptr), PNGARG((jmp_buf, int)), typedef);
|
PNG_FUNCTION(void, (PNGCAPI *png_longjmp_ptr), (jmp_buf, int), typedef);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Transform masks for the high-level interface */
|
/* Transform masks for the high-level interface */
|
||||||
|
@ -88,7 +88,7 @@
|
|||||||
|
|
||||||
/* The PNGARG macro was used in versions of libpng prior to 1.6.0 to protect
|
/* The PNGARG macro was used in versions of libpng prior to 1.6.0 to protect
|
||||||
* against legacy (pre ISOC90) compilers that did not understand function
|
* against legacy (pre ISOC90) compilers that did not understand function
|
||||||
* prototypes. It is not required for modern C compilers.
|
* prototypes. [Deprecated.]
|
||||||
*/
|
*/
|
||||||
#ifndef PNGARG
|
#ifndef PNGARG
|
||||||
# define PNGARG(arglist) arglist
|
# define PNGARG(arglist) arglist
|
||||||
@ -298,7 +298,7 @@
|
|||||||
|
|
||||||
#ifndef PNG_EXPORTA
|
#ifndef PNG_EXPORTA
|
||||||
# define PNG_EXPORTA(ordinal, type, name, args, attributes) \
|
# define PNG_EXPORTA(ordinal, type, name, args, attributes) \
|
||||||
PNG_FUNCTION(PNG_EXPORT_TYPE(type), (PNGAPI name), PNGARG(args), \
|
PNG_FUNCTION(PNG_EXPORT_TYPE(type), (PNGAPI name), args, \
|
||||||
PNG_LINKAGE_API attributes)
|
PNG_LINKAGE_API attributes)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -316,7 +316,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef PNG_CALLBACK
|
#ifndef PNG_CALLBACK
|
||||||
# define PNG_CALLBACK(type, name, args) type (PNGCBAPI name) PNGARG(args)
|
# define PNG_CALLBACK(type, name, args) type (PNGCBAPI name) args
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Support for compiler specific function attributes. These are used
|
/* Support for compiler specific function attributes. These are used
|
||||||
|
@ -20,13 +20,14 @@
|
|||||||
|
|
||||||
#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
|
#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
|
||||||
|
|
||||||
static PNG_FUNCTION(void, png_default_error,PNGARG((png_const_structrp png_ptr,
|
static PNG_FUNCTION(void /* PRIVATE */,
|
||||||
png_const_charp error_message)),PNG_NORETURN);
|
png_default_error,(png_const_structrp png_ptr, png_const_charp error_message),
|
||||||
|
PNG_NORETURN);
|
||||||
|
|
||||||
#ifdef PNG_WARNINGS_SUPPORTED
|
#ifdef PNG_WARNINGS_SUPPORTED
|
||||||
static void /* PRIVATE */
|
static void /* PRIVATE */
|
||||||
png_default_warning PNGARG((png_const_structrp png_ptr,
|
png_default_warning(png_const_structrp png_ptr,
|
||||||
png_const_charp warning_message));
|
png_const_charp warning_message);
|
||||||
#endif /* WARNINGS */
|
#endif /* WARNINGS */
|
||||||
|
|
||||||
/* This function is called whenever there is a fatal error. This function
|
/* This function is called whenever there is a fatal error. This function
|
||||||
|
@ -518,9 +518,9 @@ static int maximum_allocation = 0;
|
|||||||
static int total_allocation = 0;
|
static int total_allocation = 0;
|
||||||
static int num_allocations = 0;
|
static int num_allocations = 0;
|
||||||
|
|
||||||
png_voidp PNGCBAPI png_debug_malloc PNGARG((png_structp png_ptr,
|
png_voidp PNGCBAPI png_debug_malloc(png_structp png_ptr,
|
||||||
png_alloc_size_t size));
|
png_alloc_size_t size);
|
||||||
void PNGCBAPI png_debug_free PNGARG((png_structp png_ptr, png_voidp ptr));
|
void PNGCBAPI png_debug_free(png_structp png_ptr, png_voidp ptr);
|
||||||
|
|
||||||
png_voidp
|
png_voidp
|
||||||
PNGCBAPI png_debug_malloc(png_structp png_ptr, png_alloc_size_t size)
|
PNGCBAPI png_debug_malloc(png_structp png_ptr, png_alloc_size_t size)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user