Try to supply a prototype for the module init function but avoid

Windows "inconsistent linkage" warnings at the same time.  I agree
with Mark Hammond that the whole DL_IMPORT/DL_EXPORT macro system
needs an overhaul; this is just an expedient hack until then.

diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c
index 50161cffedff8e5df37df20c6259aa2d64d54312..d946608dac9692b9b27e53bcc84918686c2eeaa0 100644 (file)
--- a/Modules/parsermodule.c
+++ b/Modules/parsermodule.c
@@ -2846,7 +2846,7 @@ static PyMethodDef parser_functions[] =  {
     };
 
 
-DL_IMPORT(void) initparser(void);
+DL_EXPORT(void) initparser(void);  /* supply a prototype */
 
 DL_EXPORT(void)
 initparser(void)

diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
index 8b29d4b5ade8f1a8dde8d07d5c093a64f2cd19c9..28fb42b1936a1b5e68c9ac136fc8d9cb735b28c7 100644 (file)
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -854,7 +854,7 @@ static char pyexpat_module_documentation[] =
 
 /* Initialization function for the module */
 
-DL_IMPORT(void) initpyexpat(void);
+DL_EXPORT(void) initpyexpat(void);  /* supply a prototype */
 
 DL_EXPORT(void)
 initpyexpat(void)