mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[devel] Make PNG_EXPORT not user definable (leaving only PNG_EXPORTA definable)

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2010-12-06 20:18:51 -06:00
parent 49a56e7688
commit 234e543afb
5 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pngconf.h
View File

@ -305,20 +305,19 @@
# define PNG_EXPORT_TYPE(type) PNG_IMPEXP type # define PNG_EXPORT_TYPE(type) PNG_IMPEXP type
#endif #endif
#ifndef PNG_EXPORT
/* The ordinal value is only relevant when preprocessing png.h for symbol /* The ordinal value is only relevant when preprocessing png.h for symbol
* table entries, so we discard it here. See the .dfn files in the * table entries, so we discard it here. See the .dfn files in the
* scripts directory. * scripts directory.
*/ */
# define PNG_EXPORT(ordinal, type, name, args)\
extern PNG_FUNCTION(PNG_EXPORT_TYPE(type),(PNGAPI name),PNGARG(args),)
#endif
#ifndef PNG_EXPORTA #ifndef PNG_EXPORTA
# define PNG_EXPORTA(ordinal, type, name, args, attributes)\ # define PNG_EXPORTA(ordinal, type, name, args, attributes)\
extern PNG_FUNCTION(PNG_EXPORT_TYPE(type),(PNGAPI name),PNGARG(args),\ extern PNG_FUNCTION(PNG_EXPORT_TYPE(type),(PNGAPI name),PNGARG(args),\
attributes) attributes)
#endif #endif
#define PNG_EXPORT(ordinal, type, name, args)\
PNG_EXPORTA(ordinal, type, name, args, )
/* Use PNG_REMOVED to comment out a removed interface. */ /* Use PNG_REMOVED to comment out a removed interface. */
#ifndef PNG_REMOVED #ifndef PNG_REMOVED
# define PNG_REMOVED(ordinal, type, name, args, attributes) # define PNG_REMOVED(ordinal, type, name, args, attributes)

2
scripts/pngwin.dfn
View File

@ -11,8 +11,6 @@
#define PNG_EXPORTA(ordinal, type, name, args, attributes)\ #define PNG_EXPORTA(ordinal, type, name, args, attributes)\
PNG_DEFN_MAGIC- name @ordinal-PNG_DEFN_END PNG_DEFN_MAGIC- name @ordinal-PNG_DEFN_END
#define PNG_EXPORT(ordinal, type, name, args)\
PNG_DEFN_MAGIC- name @ordinal-PNG_DEFN_END
#define PNG_REMOVED(ordinal, type, name, args, attributes)\ #define PNG_REMOVED(ordinal, type, name, args, attributes)\
PNG_DEFN_MAGIC-; name @ordinal-PNG_DEFN_END PNG_DEFN_MAGIC-; name @ordinal-PNG_DEFN_END
#define PNG_EXPORT_LAST_ORDINAL(ordinal)\ #define PNG_EXPORT_LAST_ORDINAL(ordinal)\

2
scripts/sym.dfn
View File

@ -11,7 +11,5 @@
#define PNG_EXPORTA(ordinal, type, name, args, attributes)\ #define PNG_EXPORTA(ordinal, type, name, args, attributes)\
PNG_DEFN_MAGIC-SYMBOL_PREFIX @@@ name-PNG_DEFN_END PNG_DEFN_MAGIC-SYMBOL_PREFIX @@@ name-PNG_DEFN_END
#define PNG_EXPORT(ordinal, type, name, args)\
PNG_DEFN_MAGIC-SYMBOL_PREFIX @@@ name-PNG_DEFN_END
#include "../png.h" #include "../png.h"

2
scripts/symbols.dfn
View File

@ -18,8 +18,6 @@
#define PNG_EXPORTA(ordinal, type, name, args, attributes)\ #define PNG_EXPORTA(ordinal, type, name, args, attributes)\
PNG_DEFN_MAGIC-name @ordinal-PNG_DEFN_END PNG_DEFN_MAGIC-name @ordinal-PNG_DEFN_END
#define PNG_EXPORT(ordinal, type, name, args)\
PNG_DEFN_MAGIC-name @ordinal-PNG_DEFN_END
#define PNG_REMOVED(ordinal, type, name, args, attributes)\ #define PNG_REMOVED(ordinal, type, name, args, attributes)\
PNG_DEFN_MAGIC-; name @ordinal-PNG_DEFN_END PNG_DEFN_MAGIC-; name @ordinal-PNG_DEFN_END
#define PNG_EXPORT_LAST_ORDINAL(ordinal)\ #define PNG_EXPORT_LAST_ORDINAL(ordinal)\

2
scripts/vers.dfn
View File

@ -18,8 +18,6 @@
*/ */
#define PNG_EXPORTA(ordinal, type, name, args, attributes)\ #define PNG_EXPORTA(ordinal, type, name, args, attributes)\
PNG_DEFN_MAGIC- SYMBOL_PREFIX @@@ name;-PNG_DEFN_END PNG_DEFN_MAGIC- SYMBOL_PREFIX @@@ name;-PNG_DEFN_END
#define PNG_EXPORT(ordinal, type, name, args)\
PNG_DEFN_MAGIC- SYMBOL_PREFIX @@@ name;-PNG_DEFN_END
#define TRAILER PNG_DEFN_MAGIC-local: *; };-PNG_DEFN_END #define TRAILER PNG_DEFN_MAGIC-local: *; };-PNG_DEFN_END