diff options
| author | Armin Rigo <arigo@tunes.org> | 2012-06-16 08:12:45 +0200 |
|---|---|---|
| committer | Armin Rigo <arigo@tunes.org> | 2012-06-16 08:12:45 +0200 |
| commit | d4f7b8474202a2e469a1ac60a976dfc6c06d1f18 (patch) | |
| tree | aa114b68ac0d76135271b6ff3af908666dee9125 | |
| parent | 6d74e7acb55f4b240760229371e3255df0e99c0d (diff) | |
| download | cffi-d4f7b8474202a2e469a1ac60a976dfc6c06d1f18.tar.gz | |
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.
| -rw-r--r-- | c/_ffi_backend.c | 6 | ||||
| -rw-r--r-- | c/malloc_closure.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/c/_ffi_backend.c b/c/_ffi_backend.c index 57e2c7c..d30f4b5 100644 --- a/c/_ffi_backend.c +++ b/c/_ffi_backend.c @@ -929,7 +929,7 @@ static void cdataowning_dealloc(CDataObject *cd) 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 @@ static PyObject *b_callback(PyObject *self, PyObject *args) return NULL; } - closure = ffi_closure_alloc(); + closure = cffi_closure_alloc(); cd = PyObject_New(CDataObject, &CDataOwning_Type); if (cd == NULL) @@ -2941,7 +2941,7 @@ static PyObject *b_callback(PyObject *self, PyObject *args) 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 index e03a452..82527b0 100644 --- a/c/malloc_closure.h +++ b/c/malloc_closure.h @@ -102,7 +102,7 @@ static void more_core(void) /******************************************************************/ /* 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 @@ static void ffi_closure_free(ffi_closure *p) } /* 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) |