Issue #23685: Fix usage of PyMODINIT_FUNC in _json, _scproxy, nis, pyexpat

vstinner · vstinner · commit f024d263b4af · 2015-03-17T17:48:27.000+01:00
_codecs_cn, _codecs_hk, _codecs_iso2022, _codecs_jp, _codecs_kr and _codecs_tw
modules.

pyexpat.c doesn't need to redeclare PyMODINIT_FUNC, it's already declared in
Include/pyport.h.
diff --git a/Modules/_json.c b/Modules/_json.c
@@ -1995,7 +1995,7 @@ static struct PyModuleDef jsonmodule = {
         NULL
 };
 
-PyObject*
+PyMODINIT_FUNC
 PyInit__json(void)
 {
     PyObject *m = PyModule_Create(&jsonmodule);
diff --git a/Modules/_scproxy.c b/Modules/_scproxy.c
@@ -249,7 +249,7 @@ static struct PyModuleDef mod_module = {
 extern "C" {
 #endif
 
-PyObject*
+PyMODINIT_FUNC
 PyInit__scproxy(void)
 {
     return PyModule_Create(&mod_module);
diff --git a/Modules/cjkcodecs/cjkcodecs.h b/Modules/cjkcodecs/cjkcodecs.h
@@ -401,7 +401,7 @@ importmap(const char *modname, const char *symbol,
         NULL,                                                           \
         NULL                                                            \
     };                                                                  \
-    PyObject*                                                           \
+    PyMODINIT_FUNC                                                      \
     PyInit__codecs_##loc(void)                                          \
     {                                                                   \
         PyObject *m = PyModule_Create(&__module);                       \
diff --git a/Modules/nismodule.c b/Modules/nismodule.c
@@ -456,8 +456,8 @@ static struct PyModuleDef nismodule = {
     NULL
 };
 
-PyObject*
-PyInit_nis (void)
+PyMODINIT_FUNC
+PyInit_nis(void)
 {
     PyObject *m, *d;
     m = PyModule_Create(&nismodule);
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
@@ -1900,16 +1900,6 @@ PyDoc_STRVAR(pyexpat_module_documentation,
 #define MODULE_INITFUNC PyInit_pyexpat
 #endif
 
-#ifndef PyMODINIT_FUNC
-#   ifdef MS_WINDOWS
-#       define PyMODINIT_FUNC __declspec(dllexport) void
-#   else
-#       define PyMODINIT_FUNC void
-#   endif
-#endif
-
-PyMODINIT_FUNC MODULE_INITFUNC(void);  /* avoid compiler warnings */
-
 static struct PyModuleDef pyexpatmodule = {
         PyModuleDef_HEAD_INIT,
         MODULE_NAME,

Original file line number	Diff line number	Diff line change
`@@ -1995,7 +1995,7 @@ static struct PyModuleDef jsonmodule = {`
`1995`	`1995`	`NULL`
`1996`	`1996`	`};`
`1997`	`1997`
`1998`		`-PyObject*`
	`1998`	`+PyMODINIT_FUNC`
`1999`	`1999`	`PyInit__json(void)`
`2000`	`2000`	`{`
`2001`	`2001`	`PyObject *m = PyModule_Create(&jsonmodule);`
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ static struct PyModuleDef mod_module = {`
`249`	`249`	`extern "C" {`
`250`	`250`	`#endif`
`251`	`251`
`252`		`-PyObject*`
	`252`	`+PyMODINIT_FUNC`
`253`	`253`	`PyInit__scproxy(void)`
`254`	`254`	`{`
`255`	`255`	`return PyModule_Create(&mod_module);`