Use PyMODINIT_FUNC and update docs accordingly.

See https://github.com/scipy/scipy/pull/279

13 files changed, 13 insertions, 14 deletions

diff --git a/numpy/core/blasdot/_dotblas.c b/numpy/core/blasdot/_dotblas.c
index a1a8da89f..c73dd6a47 100644
--- a/numpy/core/blasdot/_dotblas.c
+++ b/numpy/core/blasdot/_dotblas.c
@@ -1230,7 +1230,7 @@ static struct PyModuleDef moduledef = {
 /* Initialization function for the module */
 #if defined(NPY_PY3K)
 #define RETVAL m
-PyObject *PyInit__dotblas(void)
+PyMODINIT_FUNC PyInit__dotblas(void)
 #else
 #define RETVAL
 PyMODINIT_FUNC init_dotblas(void)
diff --git a/numpy/core/src/dummymodule.c b/numpy/core/src/dummymodule.c
index 1d48709e9..e051cc6ff 100644
--- a/numpy/core/src/dummymodule.c
+++ b/numpy/core/src/dummymodule.c
@@ -1,4 +1,3 @@
-
 /* -*- c -*- */
 
 /*
@@ -32,7 +31,7 @@ static struct PyModuleDef moduledef = {
 
 /* Initialization function for the module */
 #if defined(NPY_PY3K)
-PyObject *PyInit__dummy(void) {
+PyMODINIT_FUNC PyInit__dummy(void) {
     PyObject *m;
     m = PyModule_Create(&moduledef);
     if (!m) {
diff --git a/numpy/core/src/multiarray/multiarray_tests.c.src b/numpy/core/src/multiarray/multiarray_tests.c.src
index 0768ec0ca..9e46624bf 100644
--- a/numpy/core/src/multiarray/multiarray_tests.c.src
+++ b/numpy/core/src/multiarray/multiarray_tests.c.src
@@ -461,7 +461,7 @@ static struct PyModuleDef moduledef = {
 
 #if defined(NPY_PY3K)
 #define RETVAL m
-PyObject *PyInit_multiarray_tests(void)
+PyMODINIT_FUNC PyInit_multiarray_tests(void)
 #else
 #define RETVAL
 PyMODINIT_FUNC
diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c
index 8bdcc2c20..e45b1d89e 100644
--- a/numpy/core/src/multiarray/multiarraymodule.c
+++ b/numpy/core/src/multiarray/multiarraymodule.c
@@ -3888,7 +3888,7 @@ static struct PyModuleDef moduledef = {
 /* Initialization function for the module */
 #if defined(NPY_PY3K)
 #define RETVAL m
-PyObject *PyInit_multiarray(void) {
+PyMODINIT_FUNC PyInit_multiarray(void) {
 #else
 #define RETVAL
 PyMODINIT_FUNC initmultiarray(void) {
diff --git a/numpy/core/src/scalarmathmodule.c.src b/numpy/core/src/scalarmathmodule.c.src
index 4b56c1510..3241f97b8 100644
--- a/numpy/core/src/scalarmathmodule.c.src
+++ b/numpy/core/src/scalarmathmodule.c.src
@@ -1998,7 +1998,7 @@ static struct PyModuleDef moduledef = {
 
 #if defined(NPY_PY3K)
 #define RETVAL m
-PyObject *PyInit_scalarmath(void)
+PyMODINIT_FUNC PyInit_scalarmath(void)
 #else
 #define RETVAL
 PyMODINIT_FUNC
diff --git a/numpy/core/src/umath/umath_tests.c.src b/numpy/core/src/umath/umath_tests.c.src
index 0ba13f15f..46d06288d 100644
--- a/numpy/core/src/umath/umath_tests.c.src
+++ b/numpy/core/src/umath/umath_tests.c.src
@@ -301,7 +301,7 @@ static struct PyModuleDef moduledef = {
 
 #if defined(NPY_PY3K)
 #define RETVAL m
-PyObject *PyInit_umath_tests(void)
+PyMODINIT_FUNC PyInit_umath_tests(void)
 #else
 #define RETVAL
 PyMODINIT_FUNC
diff --git a/numpy/core/src/umath/umathmodule.c b/numpy/core/src/umath/umathmodule.c
index 3cd193b23..97f6f042c 100644
--- a/numpy/core/src/umath/umathmodule.c
+++ b/numpy/core/src/umath/umathmodule.c
@@ -323,7 +323,7 @@ static struct PyModuleDef moduledef = {
 
 #if defined(NPY_PY3K)
 #define RETVAL m
-PyObject *PyInit_umath(void)
+PyMODINIT_FUNC PyInit_umath(void)
 #else
 #define RETVAL
 PyMODINIT_FUNC initumath(void)
diff --git a/numpy/f2py/rules.py b/numpy/f2py/rules.py
index 83f5811e5..9d943e884 100644
--- a/numpy/f2py/rules.py
+++ b/numpy/f2py/rules.py
@@ -186,7 +186,7 @@ static struct PyModuleDef moduledef = {
 
 #if PY_VERSION_HEX >= 0x03000000
 #define RETVAL m
-PyObject *PyInit_#modulename#(void) {
+PyMODINIT_FUNC PyInit_#modulename#(void) {
 #else
 #define RETVAL
 PyMODINIT_FUNC init#modulename#(void) {
diff --git a/numpy/f2py/tests/src/array_from_pyobj/wrapmodule.c b/numpy/f2py/tests/src/array_from_pyobj/wrapmodule.c
index e75a667eb..9a21f2420 100644
--- a/numpy/f2py/tests/src/array_from_pyobj/wrapmodule.c
+++ b/numpy/f2py/tests/src/array_from_pyobj/wrapmodule.c
@@ -132,7 +132,7 @@ static struct PyModuleDef moduledef = {
 
 #if PY_VERSION_HEX >= 0x03000000
 #define RETVAL m
-PyObject *PyInit_test_array_from_pyobj_ext(void) {
+PyMODINIT_FUNC PyInit_test_array_from_pyobj_ext(void) {
 #else
 #define RETVAL
 PyMODINIT_FUNC inittest_array_from_pyobj_ext(void) {
diff --git a/numpy/fft/fftpack_litemodule.c b/numpy/fft/fftpack_litemodule.c
index 7652ac0e2..499c72828 100644
--- a/numpy/fft/fftpack_litemodule.c
+++ b/numpy/fft/fftpack_litemodule.c
@@ -326,7 +326,7 @@ static struct PyModuleDef moduledef = {
 /* Initialization function for the module */
 #if PY_MAJOR_VERSION >= 3
 #define RETVAL m
-PyObject *PyInit_fftpack_lite(void)
+PyMODINIT_FUNC PyInit_fftpack_lite(void)
 #else
 #define RETVAL
 PyMODINIT_FUNC
diff --git a/numpy/lib/src/_compiled_base.c b/numpy/lib/src/_compiled_base.c
index d389b7f8e..41caca962 100644
--- a/numpy/lib/src/_compiled_base.c
+++ b/numpy/lib/src/_compiled_base.c
@@ -1708,7 +1708,7 @@ static struct PyModuleDef moduledef = {
 
 #if defined(NPY_PY3K)
 #define RETVAL m
-PyObject *PyInit__compiled_base(void)
+PyMODINIT_FUNC PyInit__compiled_base(void)
 #else
 #define RETVAL
 PyMODINIT_FUNC
diff --git a/numpy/linalg/lapack_litemodule.c b/numpy/linalg/lapack_litemodule.c
index cc6238239..3e1790a18 100644
--- a/numpy/linalg/lapack_litemodule.c
+++ b/numpy/linalg/lapack_litemodule.c
@@ -848,7 +848,7 @@ static struct PyModuleDef moduledef = {
 /* Initialization function for the module */
 #if PY_MAJOR_VERSION >= 3
 #define RETVAL m
-PyObject *PyInit_lapack_lite(void)
+PyMODINIT_FUNC PyInit_lapack_lite(void)
 #else
 #define RETVAL
 PyMODINIT_FUNC
diff --git a/numpy/numarray/_capi.c b/numpy/numarray/_capi.c
index 78187c50e..032379515 100644
--- a/numpy/numarray/_capi.c
+++ b/numpy/numarray/_capi.c
@@ -3394,7 +3394,7 @@ static struct PyModuleDef moduledef = {
         NULL
 };
 
-PyObject *PyInit__capi(void)
+PyMODINIT_FUNC PyInit__capi(void)
 #else
 
 #define RETVAL