Merge pull request #6790 from matthew-brett/fix-c90-warning-error

tacaswell · web-flow · commit 1787fff961cb · 2016-10-10T22:47:40.000-04:00
MNT: fix C90 warning -&gt; error in new tkagg code
diff --git a/src/_tkagg.cpp b/src/_tkagg.cpp
@@ -351,7 +351,8 @@ int load_tkinter_funcs(void)
 // From module __file__ attribute to char *string for dlopen.
 char *fname2char(PyObject *fname)
 {
-    PyObject *bytes = PyUnicode_EncodeFSDefault(fname);
+    PyObject* bytes;
+    bytes = PyUnicode_EncodeFSDefault(fname);
     if (bytes == NULL) {
         return NULL;
     }
@@ -372,9 +373,10 @@ void *_dfunc(void *lib_handle, const char *func_name)
     // Set Python exception if we can't find `func_name` in `lib_handle`.
     // Returns function pointer or NULL if not present.
 
+    void* func;
     // Reset errors.
     dlerror();
-    void *func = dlsym(lib_handle, func_name);
+    func = dlsym(lib_handle, func_name);
     if (func == NULL) {
         const char *error = dlerror();
         PyErr_SetString(PyExc_RuntimeError, error);
