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

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)

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)\

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"

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)\

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