Merge pull request matplotlib#2107 from cgohlke/patch-1

mdboom · mdboom · commit 42055bd2c77b · 2013-06-01T11:17:05.000-07:00
Fix 64 bit compatibility on Windows
diff --git a/src/_tkagg.cpp b/src/_tkagg.cpp
@@ -219,7 +219,7 @@ _pyobj_addr(PyObject* self, PyObject* args)
     {
         return NULL;
     }
-    return Py_BuildValue("l", (long) pyobj);
+    return Py_BuildValue("n", (Py_ssize_t) pyobj);
 }
 
 static PyObject*
@@ -228,9 +228,9 @@ _tkinit(PyObject* self, PyObject* args)
     Tcl_Interp* interp;
     TkappObject* app;
 
-    long arg;
+    Py_ssize_t arg;
     int is_interp;
-    if (!PyArg_ParseTuple(args, "li", &arg, &is_interp))
+    if (!PyArg_ParseTuple(args, "ni", &arg, &is_interp))
     {
         return NULL;
     }

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ _pyobj_addr(PyObject* self, PyObject* args)`
`219`	`219`	`{`
`220`	`220`	`return NULL;`
`221`	`221`	`}`
`222`		`- return Py_BuildValue("l", (long) pyobj);`
	`222`	`+ return Py_BuildValue("n", (Py_ssize_t) pyobj);`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`static PyObject*`
`@@ -228,9 +228,9 @@ _tkinit(PyObject* self, PyObject* args)`
`228`	`228`	`Tcl_Interp* interp;`
`229`	`229`	`TkappObject* app;`
`230`	`230`
`231`		`- long arg;`
	`231`	`+ Py_ssize_t arg;`
`232`	`232`	`int is_interp;`
`233`		`- if (!PyArg_ParseTuple(args, "li", &arg, &is_interp))`
	`233`	`+ if (!PyArg_ParseTuple(args, "ni", &arg, &is_interp))`
`234`	`234`	`{`
`235`	`235`	`return NULL;`
`236`	`236`	`}`