diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-12-19 23:55:45 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-12-19 23:55:45 +0100 |
| commit | 759a3bcc88230c5232b748bb8f5a0c6e0cce128c (patch) | |
| tree | 25c15bb606cf573ac217f82b2110166a45520734 /lib | |
| parent | 9617a3945b804bf2d1409285df2a7add12690063 (diff) | |
| parent | 04bef7fe2ab689a9ab569d5581034e0c02237771 (diff) | |
| download | samba-759a3bcc88230c5232b748bb8f5a0c6e0cce128c.tar.gz samba-759a3bcc88230c5232b748bb8f5a0c6e0cce128c.tar.bz2 samba-759a3bcc88230c5232b748bb8f5a0c6e0cce128c.zip | |
Merge branch 'pyregistry' of git://git.samba.org/jelmer/samba
Conflicts:
source4/lib/ldb/ldb_wrap.c
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/talloc/pytalloc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/talloc/pytalloc.h b/lib/talloc/pytalloc.h index aad5840a67..bff6f31d27 100644 --- a/lib/talloc/pytalloc.h +++ b/lib/talloc/pytalloc.h @@ -21,6 +21,7 @@ #define _PY_TALLOC_H_ #include <Python.h> +#include <talloc.h> typedef struct { PyObject_HEAD @@ -36,8 +37,7 @@ void py_talloc_dealloc(PyObject* self); /* FIXME: Call PyErr_SetString(PyExc_TypeError, "expected " __STR(type) ") * when talloc_get_type() returns NULL. */ -#define py_talloc_get_type(py_obj, type) \ - talloc_get_type(py_talloc_get_ptr(py_obj), type) +#define py_talloc_get_type(py_obj, type) (talloc_get_type(py_talloc_get_ptr(py_obj), type)) #define py_talloc_get_ptr(py_obj) ((py_talloc_Object *)py_obj)->ptr #define py_talloc_get_mem_ctx(py_obj) ((py_talloc_Object *)py_obj)->talloc_ctx |