diff --git a/pngconf.h b/pngconf.h index 7204ef0ae..bbc4aa654 100644 --- a/pngconf.h +++ b/pngconf.h @@ -305,20 +305,19 @@ # define PNG_EXPORT_TYPE(type) PNG_IMPEXP type #endif -#ifndef PNG_EXPORT /* 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 * scripts directory. */ -# define PNG_EXPORT(ordinal, type, name, args)\ - extern PNG_FUNCTION(PNG_EXPORT_TYPE(type),(PNGAPI name),PNGARG(args),) -#endif #ifndef PNG_EXPORTA # define PNG_EXPORTA(ordinal, type, name, args, attributes)\ extern PNG_FUNCTION(PNG_EXPORT_TYPE(type),(PNGAPI name),PNGARG(args),\ attributes) #endif +#define PNG_EXPORT(ordinal, type, name, args)\ + PNG_EXPORTA(ordinal, type, name, args, ) + /* Use PNG_REMOVED to comment out a removed interface. */ #ifndef PNG_REMOVED # define PNG_REMOVED(ordinal, type, name, args, attributes) diff --git a/scripts/pngwin.dfn b/scripts/pngwin.dfn index 5977a889a..4c38024d3 100644 --- a/scripts/pngwin.dfn +++ b/scripts/pngwin.dfn @@ -11,8 +11,6 @@ #define PNG_EXPORTA(ordinal, type, name, args, attributes)\ 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)\ PNG_DEFN_MAGIC-; name @ordinal-PNG_DEFN_END #define PNG_EXPORT_LAST_ORDINAL(ordinal)\ diff --git a/scripts/sym.dfn b/scripts/sym.dfn index 0b2cac124..e18d73bca 100644 --- a/scripts/sym.dfn +++ b/scripts/sym.dfn @@ -11,7 +11,5 @@ #define PNG_EXPORTA(ordinal, type, name, args, attributes)\ 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" diff --git a/scripts/symbols.dfn b/scripts/symbols.dfn index 1623e9abe..c13b3fbec 100644 --- a/scripts/symbols.dfn +++ b/scripts/symbols.dfn @@ -18,8 +18,6 @@ #define PNG_EXPORTA(ordinal, type, name, args, attributes)\ 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)\ PNG_DEFN_MAGIC-; name @ordinal-PNG_DEFN_END #define PNG_EXPORT_LAST_ORDINAL(ordinal)\ diff --git a/scripts/vers.dfn b/scripts/vers.dfn index 6f8bef49d..b1b425157 100644 --- a/scripts/vers.dfn +++ b/scripts/vers.dfn @@ -18,8 +18,6 @@ */ #define PNG_EXPORTA(ordinal, type, name, args, attributes)\ 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