diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-01-14 02:48:50 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-01-14 19:53:06 +0100 |
| commit | d5903fd75e9640831f0e78fc04d3ffa5ea3b1b4a (patch) | |
| tree | 6849a97abe125f35f7786246f07bc77280e21f4f /source4/scripting | |
| parent | 2afa1bee549ae119b1088c1e6affaec6f1997887 (diff) | |
| download | samba-d5903fd75e9640831f0e78fc04d3ffa5ea3b1b4a.tar.gz samba-d5903fd75e9640831f0e78fc04d3ffa5ea3b1b4a.tar.bz2 samba-d5903fd75e9640831f0e78fc04d3ffa5ea3b1b4a.zip | |
pidl/python: Fix compilation of py_echo.
(This used to be commit 5ee99ff31c80ece6861b2a0323d71170ef9346b9)
Diffstat (limited to 'source4/scripting')
| -rw-r--r-- | source4/scripting/python/config.mk | 2 | ||||
| -rw-r--r-- | source4/scripting/python/pytalloc.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk index cfd179aff5..f00b477919 100644 --- a/source4/scripting/python/config.mk +++ b/source4/scripting/python/config.mk @@ -5,7 +5,7 @@ OBJ_FILES = smbpython.o [SUBSYSTEM::LIBPYTHON] PUBLIC_DEPENDENCIES = EXT_LIB_PYTHON INIT_FUNCTION_SENTINEL = { NULL, NULL } -OBJ_FILES = modules.o +OBJ_FILES = modules.o pytalloc.o [PYTHON::python_uuid] PRIVATE_DEPENDENCIES = LIBNDR diff --git a/source4/scripting/python/pytalloc.c b/source4/scripting/python/pytalloc.c index d0b8cb83f2..dc61a0a13d 100644 --- a/source4/scripting/python/pytalloc.c +++ b/source4/scripting/python/pytalloc.c @@ -18,6 +18,7 @@ */ #include "includes.h" +#include "scripting/python/pytalloc.h" void py_talloc_dealloc(PyObject* self) { @@ -26,13 +27,13 @@ void py_talloc_dealloc(PyObject* self) PyObject_Del(self); } -PyObject *py_talloc_import(PyTypeObject *py_type, TALLOC_CTX *mem_ctx, +PyObject *py_talloc_import_ex(PyTypeObject *py_type, TALLOC_CTX *mem_ctx, void *ptr) { - PyObject *ret = PyObject_New(py_talloc_Object, &py_type); + py_talloc_Object *ret = PyObject_New(py_talloc_Object, py_type); ret->talloc_ctx = talloc_reference(mem_ctx, ptr); ret->ptr = ptr; - return ret; + return (PyObject *)ret; } PyObject *py_talloc_default_repr(PyObject *py_obj) |