merge 3.5 (#26827)

benjaminp · benjaminp · commit 9046df065992 · 2016-04-22T23:43:24.000-07:00
diff --git a/Doc/howto/cporting.rst b/Doc/howto/cporting.rst
@@ -161,7 +161,7 @@ simple example demonstrates how. ::
 
    #define INITERROR return NULL
 
-   PyObject *
+   PyMODINIT_FUNC
    PyInit_myextension(void)
 
    #else
