[libpng16] Replaced arbitrary use of 'extern' with #define PNG_LINKAGE_*. To

preserve API compatibility, the new defines all default to "extern"
(requested by Jan Nijtmans).
This commit is contained in:
Glenn Randers-Pehrson
2015-07-03 16:07:54 -05:00
parent a390897ba4
commit b9e5e5f5a8
6 changed files with 34 additions and 12 deletions

View File

@@ -249,6 +249,17 @@ setting Z_DEFAULT_STRATEGY default @Z_FILTERED
setting Z_DEFAULT_NOFILTER_STRATEGY default @Z_DEFAULT_STRATEGY
setting ZLIB_VERNUM default @ZLIB_VERNUM
# Linkage of:
#
# API: libpng API functions
# CALLBACK: internal non-file-local callbacks
# FUNCTION: internal non-file-local functions
# DATA: internal non-file-local (const) data
setting LINKAGE_API default extern
setting LINKAGE_CALLBACK default extern
setting LINKAGE_FUNCTION default extern
setting LINKAGE_DATA default extern
setting TEXT_Z_DEFAULT_COMPRESSION default @Z_DEFAULT_COMPRESSION
setting TEXT_Z_DEFAULT_STRATEGY default @Z_DEFAULT_STRATEGY

View File

@@ -2,7 +2,7 @@
/* pnglibconf.h - library build configuration */
/* Libpng version 1.6.18beta09 - June 30, 2015 */
/* Libpng version 1.6.18beta09 - July 3, 2015 */
/* Copyright (c) 1998-2014 Glenn Randers-Pehrson */
@@ -190,6 +190,10 @@
#define PNG_GAMMA_THRESHOLD_FIXED 5000
#define PNG_IDAT_READ_SIZE PNG_ZBUF_SIZE
#define PNG_INFLATE_BUF_SIZE 1024
#define PNG_LINKAGE_API extern
#define PNG_LINKAGE_CALLBACK extern
#define PNG_LINKAGE_DATA extern
#define PNG_LINKAGE_FUNCTION extern
#define PNG_MAX_GAMMA_8 11
#define PNG_QUANTIZE_BLUE_BITS 5
#define PNG_QUANTIZE_GREEN_BITS 5