changeset:   95020:22a0c925a7c2
parent:      95017:c89f7c34e356
user:        Victor Stinner <victor.stinner@gmail.com>
date:        Tue Mar 17 17:48:27 2015 +0100
files:       Modules/_json.c Modules/_scproxy.c Modules/cjkcodecs/cjkcodecs.h Modules/nismodule.c Modules/pyexpat.c
description:
Issue #23685: Fix usage of PyMODINIT_FUNC in _json, _scproxy, nis, pyexpat
_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 -r c89f7c34e356 -r 22a0c925a7c2 Modules/_json.c
--- a/Modules/_json.c	Tue Mar 17 04:32:30 2015 -0700
+++ b/Modules/_json.c	Tue Mar 17 17:48:27 2015 +0100
@@ -1995,7 +1995,7 @@
         NULL
 };
 
-PyObject*
+PyMODINIT_FUNC
 PyInit__json(void)
 {
     PyObject *m = PyModule_Create(&jsonmodule);
diff -r c89f7c34e356 -r 22a0c925a7c2 Modules/_scproxy.c
--- a/Modules/_scproxy.c	Tue Mar 17 04:32:30 2015 -0700
+++ b/Modules/_scproxy.c	Tue Mar 17 17:48:27 2015 +0100
@@ -249,7 +249,7 @@
 extern "C" {
 #endif
 
-PyObject*
+PyMODINIT_FUNC
 PyInit__scproxy(void)
 {
     return PyModule_Create(&mod_module);
diff -r c89f7c34e356 -r 22a0c925a7c2 Modules/cjkcodecs/cjkcodecs.h
--- a/Modules/cjkcodecs/cjkcodecs.h	Tue Mar 17 04:32:30 2015 -0700
+++ b/Modules/cjkcodecs/cjkcodecs.h	Tue Mar 17 17:48:27 2015 +0100
@@ -401,7 +401,7 @@
         NULL,                                                           \
         NULL                                                            \
     };                                                                  \
-    PyObject*                                                           \
+    PyMODINIT_FUNC                                                      \
     PyInit__codecs_##loc(void)                                          \
     {                                                                   \
         PyObject *m = PyModule_Create(&__module);                       \
diff -r c89f7c34e356 -r 22a0c925a7c2 Modules/nismodule.c
--- a/Modules/nismodule.c	Tue Mar 17 04:32:30 2015 -0700
+++ b/Modules/nismodule.c	Tue Mar 17 17:48:27 2015 +0100
@@ -456,8 +456,8 @@
     NULL
 };
 
-PyObject*
-PyInit_nis (void)
+PyMODINIT_FUNC
+PyInit_nis(void)
 {
     PyObject *m, *d;
     m = PyModule_Create(&nismodule);
diff -r c89f7c34e356 -r 22a0c925a7c2 Modules/pyexpat.c
--- a/Modules/pyexpat.c	Tue Mar 17 04:32:30 2015 -0700
+++ b/Modules/pyexpat.c	Tue Mar 17 17:48:27 2015 +0100
@@ -1900,16 +1900,6 @@
 #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,