commit 221d6872c432842534b302da4670014c29588566
author Bram Moolenaar <Bram@vim.org> Sat Jun 30 13:34:34 2012 +0200
committer Bram Moolenaar <Bram@vim.org> Sat Jun 30 13:34:34 2012 +0200
tree 1abdf0dd64086b45df075e573229fe54c04436e6
parent e721122b792698096b1c7fd5641e61fa37231408

updated for version 7.3.584
Problem:    PyCObject is not always defined.
Solution:   Use PyObject instead.

src/if_py_both.h

diff --git a/src/if_py_both.h b/src/if_py_both.h
index 0912ee0..530c6d8 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -2432,32 +2432,25 @@
 convert_dl(PyObject *obj, typval_T *tv,
 				    pytotvfunc py_to_tv, PyObject *lookupDict)
 {
-# ifdef PY_USE_CAPSULE
     PyObject	*capsule;
-# else
-    PyCObject	*cobject;
-# endif
     char	hexBuf[sizeof(void *) * 2 + 3];
 
     sprintf(hexBuf, "%p", obj);
 
 # ifdef PY_USE_CAPSULE
     capsule = PyDict_GetItemString(lookupDict, hexBuf);
-    if (capsule == NULL)
 # else
-    cobject = (PyCObject *)PyDict_GetItemString(lookupDict, hexBuf);
-    if (cobject == NULL)
+    capsule = (PyObject *)PyDict_GetItemString(lookupDict, hexBuf);
 # endif
+    if (capsule == NULL)
     {
 # ifdef PY_USE_CAPSULE
 	capsule = PyCapsule_New(tv, NULL, NULL);
+# else
+	capsule = PyCObject_FromVoidPtr(tv, NULL);
+# endif
 	PyDict_SetItemString(lookupDict, hexBuf, capsule);
 	Py_DECREF(capsule);
-# else
-	cobject = PyCObject_FromVoidPtr(tv, NULL);
-	PyDict_SetItemString(lookupDict, hexBuf, cobject);
-	Py_DECREF(cobject);
-# endif
 	if (py_to_tv(obj, tv, lookupDict) == -1)
 	{
 	    tv->v_type = VAR_UNKNOWN;
@@ -2478,7 +2471,7 @@
 # ifdef PY_USE_CAPSULE
 	v = PyCapsule_GetPointer(capsule, NULL);
 # else
-	v = PyCObject_AsVoidPtr(cobject);
+	v = PyCObject_AsVoidPtr(capsule);
 # endif
 	copy_tv(v, tv);
     }