Don't need module_state struct at all

mdboom · mdboom · commit 43e2d0bd758b · 2015-10-21T11:39:41.000-04:00
diff --git a/lib/matplotlib/tri/_tri_wrapper.cpp b/lib/matplotlib/tri/_tri_wrapper.cpp
@@ -478,17 +478,12 @@ static PyTypeObject* PyTrapezoidMapTriFinder_init_type(PyObject* m, PyTypeObject
 
 extern "C" {
 
-struct module_state
-{
-    int _dummy;
-};
-
 #if PY3K
 static struct PyModuleDef moduledef = {
     PyModuleDef_HEAD_INIT,
     "_tri",
     NULL,
-    sizeof(struct module_state),
+    0,
     NULL,
     NULL,
     NULL,
diff --git a/src/_backend_agg_wrapper.cpp b/src/_backend_agg_wrapper.cpp
@@ -725,17 +725,12 @@ static PyTypeObject *PyRendererAgg_init_type(PyObject *m, PyTypeObject *type)
 
 extern "C" {
 
-struct module_state
-{
-    int _dummy;
-};
-
 #if PY3K
 static struct PyModuleDef moduledef = {
     PyModuleDef_HEAD_INIT,
     "_backend_agg",
     NULL,
-    sizeof(struct module_state),
+    0,
     NULL,
     NULL,
     NULL,
diff --git a/src/_contour_wrapper.cpp b/src/_contour_wrapper.cpp
@@ -138,17 +138,12 @@ static PyTypeObject* PyQuadContourGenerator_init_type(PyObject* m, PyTypeObject*
 
 extern "C" {
 
-struct module_state
-{
-    int _dummy;
-};
-
 #if PY3K
 static struct PyModuleDef moduledef = {
     PyModuleDef_HEAD_INIT,
     "_contour",
     NULL,
-    sizeof(struct module_state),
+    0,
     NULL,
     NULL,
     NULL,
diff --git a/src/_gtkagg.cpp b/src/_gtkagg.cpp
@@ -108,17 +108,12 @@ static PyMethodDef module_methods[] = {
 
 extern "C" {
 
-    struct module_state
-    {
-        int _dummy;
-    };
-
 #if PY3K
     static struct PyModuleDef moduledef = {
         PyModuleDef_HEAD_INIT,
         "_gtkagg",
         NULL,
-        sizeof(struct module_state),
+        0,
         module_methods,
         NULL,
         NULL,
diff --git a/src/_image_wrapper.cpp b/src/_image_wrapper.cpp
@@ -728,17 +728,12 @@ static PyMethodDef module_functions[] = {
 
 extern "C" {
 
-struct module_state
-{
-    int _dummy;
-};
-
 #if PY3K
 static struct PyModuleDef moduledef = {
     PyModuleDef_HEAD_INIT,
     "_image",
     NULL,
-    sizeof(struct module_state),
+    0,
     module_functions,
     NULL,
     NULL,
diff --git a/src/_path_wrapper.cpp b/src/_path_wrapper.cpp
@@ -730,17 +730,12 @@ extern "C" {
         {NULL}
     };
 
-    struct module_state
-    {
-        int _dummy;
-    };
-
 #if PY3K
     static struct PyModuleDef moduledef = {
         PyModuleDef_HEAD_INIT,
         "_path",
         NULL,
-        sizeof(struct module_state),
+        0,
         module_functions,
         NULL,
         NULL,
diff --git a/src/_png.cpp b/src/_png.cpp
@@ -520,17 +520,12 @@ static PyMethodDef module_methods[] = {
 
 extern "C" {
 
-    struct module_state
-    {
-        int _dummy;
-    };
-
 #if PY3K
     static struct PyModuleDef moduledef = {
         PyModuleDef_HEAD_INIT,
         "_png",
         NULL,
-        sizeof(struct module_state),
+        0,
         module_methods,
         NULL,
         NULL,
diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp
@@ -1640,15 +1640,18 @@ static PyTypeObject *PyFT2Font_init_type(PyObject *m, PyTypeObject *type)
 
 extern "C" {
 
-struct module_state
-{
-    int _dummy;
-};
-
 #if PY3K
-static struct PyModuleDef moduledef = { PyModuleDef_HEAD_INIT,       "ft2font", NULL,
-                                        sizeof(struct module_state), NULL,      NULL,
-                                        NULL,                        NULL,      NULL };
+static struct PyModuleDef moduledef = {
+    PyModuleDef_HEAD_INIT,
+    "ft2font",
+    NULL,
+    0,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+};
 
 #define INITERROR return NULL
 
