Inline convert_voidptr to tkagg.

QuLogic · QuLogic · commit a786d2a3e09b · 2021-01-27T17:26:57.000-05:00
It's only used in this file, and pulling in the whole `py_converters.h`
causes this extension to unnecessarily require compiling against NumPy.
diff --git a/setupext.py b/setupext.py
@@ -447,7 +447,6 @@ def get_extensions(self):
         ext = Extension(
             "matplotlib.backends._tkagg", [
                 "src/_tkagg.cpp",
-                "src/py_converters.cpp",
             ],
             include_dirs=["src"],
             # psapi library needed for finding Tcl/Tk at run time.
diff --git a/src/_tkagg.cpp b/src/_tkagg.cpp
@@ -33,14 +33,17 @@
 #define dlsym GetProcAddress
 #else
 #include <dlfcn.h>
-// Suppress -Wunused-function on POSIX, but not on Windows where that would
-// lead to PY_ARRAY_UNIQUE_SYMBOL being an unresolved external.
-#define NO_IMPORT_ARRAY
 #endif
 
 // Include our own excerpts from the Tcl / Tk headers
 #include "_tkmini.h"
-#include "py_converters.h"
+
+static int convert_voidptr(PyObject *obj, void *p)
+{
+    void **val = (void **)p;
+    *val = PyLong_AsVoidPtr(obj);
+    return *val != NULL ? 1 : !PyErr_Occurred();
+}
 
 // Global vars for Tk functions.  We load these symbols from the tkinter
 // extension module or loaded Tk libraries at run-time.
diff --git a/src/py_converters.cpp b/src/py_converters.cpp
@@ -94,13 +94,6 @@ int convert_from_attr(PyObject *obj, const char *name, converter func, void *p)
     return 1;
 }
 
-int convert_voidptr(PyObject *obj, void *p)
-{
-    void **val = (void **)p;
-    *val = PyLong_AsVoidPtr(obj);
-    return *val != NULL ? 1 : !PyErr_Occurred();
-}
-
 int convert_double(PyObject *obj, void *p)
 {
     double *val = (double *)p;
diff --git a/src/py_converters.h b/src/py_converters.h
@@ -22,7 +22,6 @@ typedef int (*converter)(PyObject *, void *);
 int convert_from_attr(PyObject *obj, const char *name, converter func, void *p);
 int convert_from_method(PyObject *obj, const char *name, converter func, void *p);
 
-int convert_voidptr(PyObject *obj, void *p);
 int convert_double(PyObject *obj, void *p);
 int convert_bool(PyObject *obj, void *p);
 int convert_cap(PyObject *capobj, void *capp);

Original file line number	Diff line number	Diff line change
`@@ -94,13 +94,6 @@ int convert_from_attr(PyObject obj, const char name, converter func, void *p)`
`94`	`94`	`return 1;`
`95`	`95`	`}`
`96`	`96`
`97`		`-int convert_voidptr(PyObject obj, void p)`
`98`		`-{`
`99`		`- void val = (void )p;`
`100`		`- *val = PyLong_AsVoidPtr(obj);`
`101`		`- return *val != NULL ? 1 : !PyErr_Occurred();`
`102`		`-}`
`103`		`-`
`104`	`97`	`int convert_double(PyObject obj, void p)`
`105`	`98`	`{`
`106`	`99`	`double val = (double )p;`