[pypy-commit] cffi default: Uh, ffi_closure_alloc() and ffi_closure_free() are already defined

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r383:befb2fde6334
Date: 2012-06-16 08:12 +0200
http://bitbucket.org/cffi/cffi/changeset/befb2fde6334/

Log:	Uh, ffi_closure_alloc() and ffi_closure_free() are already defined
	in recent versions of <ffi.h>, but of course not all of them.
	Rename.

diff --git a/c/_ffi_backend.c b/c/_ffi_backend.c
--- a/c/_ffi_backend.c
+++ b/c/_ffi_backend.c
@@ -929,7 +929,7 @@
         ffi_closure *closure = (ffi_closure *)cd->c_data;
         PyObject *args = (PyObject *)(closure->user_data);
         Py_XDECREF(args);
-        ffi_closure_free(closure);
+        cffi_closure_free(closure);
     }
     cdata_dealloc(cd);
 }
@@ -2913,7 +2913,7 @@
         return NULL;
     }
 
-    closure = ffi_closure_alloc();
+    closure = cffi_closure_alloc();
 
     cd = PyObject_New(CDataObject, &CDataOwning_Type);
     if (cd == NULL)
@@ -2941,7 +2941,7 @@
  error:
     closure->user_data = NULL;
     if (cd == NULL)
-        ffi_closure_free(closure);
+        cffi_closure_free(closure);
     else
         Py_DECREF(cd);
     return NULL;
diff --git a/c/malloc_closure.h b/c/malloc_closure.h
--- a/c/malloc_closure.h
+++ b/c/malloc_closure.h
@@ -102,7 +102,7 @@
 /******************************************************************/
 
 /* put the item back into the free list */
-static void ffi_closure_free(ffi_closure *p)
+static void cffi_closure_free(ffi_closure *p)
 {
     union mmaped_block *item = (union mmaped_block *)p;
     item->next = free_list;
@@ -110,7 +110,7 @@
 }
 
 /* return one item from the free list, allocating more if needed */
-static ffi_closure *ffi_closure_alloc(void)
+static ffi_closure *cffi_closure_alloc(void)
 {
     union mmaped_block *item;
     if (!free_list)