From ba5d6e6d706ebf07640ee24d701255cbb4803525 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 8 Jan 2009 12:20:20 +0100 Subject: Avoid using a utility header for Python replacements included in Samba, since this will not be shipped with talloc/tdb/tevent/etc. --- source4/auth/credentials/pycredentials.c | 6 +++++- source4/lib/com/pycom.c | 6 +++++- source4/lib/ldb/pyldb.c | 6 +++++- source4/lib/messaging/pymessaging.c | 6 +++++- source4/lib/registry/pyregistry.c | 6 +++++- source4/librpc/ndr/py_security.c | 6 +++++- source4/librpc/rpc/pyrpc.c | 6 +++++- source4/param/pyparam.c | 6 +++++- source4/scripting/python/pyglue.c | 6 +++++- source4/web_server/wsgi.c | 6 +++++- 10 files changed, 50 insertions(+), 10 deletions(-) (limited to 'source4') diff --git a/source4/auth/credentials/pycredentials.c b/source4/auth/credentials/pycredentials.c index 6821170853..6fcab80ce6 100644 --- a/source4/auth/credentials/pycredentials.c +++ b/source4/auth/credentials/pycredentials.c @@ -17,7 +17,7 @@ */ #include "includes.h" -#include "../lib/util/python_util.h" +#include #include "pycredentials.h" #include "param/param.h" #include "lib/cmdline/credentials.h" @@ -25,6 +25,10 @@ #include "libcli/util/pyerrors.h" #include "param/pyparam.h" +#ifndef Py_RETURN_NONE +#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None +#endif + struct cli_credentials *cli_credentials_from_py_object(PyObject *py_obj) { if (py_obj == Py_None) { diff --git a/source4/lib/com/pycom.c b/source4/lib/com/pycom.c index 753b7f8f9d..d5a07580ea 100644 --- a/source4/lib/com/pycom.c +++ b/source4/lib/com/pycom.c @@ -18,11 +18,15 @@ */ #include "includes.h" -#include "../lib/util/python_util.h" +#include #include "lib/com/com.h" #include "librpc/ndr/libndr.h" #include "libcli/util/pyerrors.h" +#ifndef Py_RETURN_NONE +#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None +#endif + static struct com_context *py_com_ctx = NULL; /* FIXME: evil global */ static PyObject *py_get_class_object(PyObject *self, PyObject *args) diff --git a/source4/lib/ldb/pyldb.c b/source4/lib/ldb/pyldb.c index b7a78e8f53..89ef7aeddf 100644 --- a/source4/lib/ldb/pyldb.c +++ b/source4/lib/ldb/pyldb.c @@ -26,7 +26,7 @@ */ #include "ldb_includes.h" -#include "../lib/util/python_util.h" +#include #include "pyldb.h" /* There's no Py_ssize_t in 2.4, apparently */ @@ -36,6 +36,10 @@ typedef inquiry lenfunc; typedef intargfunc ssizeargfunc; #endif +#ifndef Py_RETURN_NONE +#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None +#endif + /* Picked out of thin air. To do this properly, we should probably have some part of the * errors in LDB be allocated to bindings ? */ #define LDB_ERR_PYTHON_EXCEPTION 142 diff --git a/source4/lib/messaging/pymessaging.c b/source4/lib/messaging/pymessaging.c index 3fa59bde57..535da4526c 100644 --- a/source4/lib/messaging/pymessaging.c +++ b/source4/lib/messaging/pymessaging.c @@ -20,7 +20,7 @@ */ #include "includes.h" -#include "../lib/util/python_util.h" +#include #include "scripting/python/modules.h" #include "libcli/util/pyerrors.h" #include "librpc/rpc/pyrpc.h" @@ -30,6 +30,10 @@ #include "cluster/cluster.h" #include "param/param.h" +#ifndef Py_RETURN_NONE +#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None +#endif + PyAPI_DATA(PyTypeObject) messaging_Type; PyAPI_DATA(PyTypeObject) irpc_ClientConnectionType; diff --git a/source4/lib/registry/pyregistry.c b/source4/lib/registry/pyregistry.c index c28fcaa685..166543b6fd 100644 --- a/source4/lib/registry/pyregistry.c +++ b/source4/lib/registry/pyregistry.c @@ -18,7 +18,7 @@ */ #include "includes.h" -#include "../lib/util/python_util.h" +#include #include "libcli/util/pyerrors.h" #include "lib/registry/registry.h" #include "scripting/python/modules.h" /* for py_iconv_convenience() */ @@ -26,6 +26,10 @@ #include #include "param/pyparam.h" +#ifndef Py_RETURN_NONE +#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None +#endif + extern struct cli_credentials *cli_credentials_from_py_object(PyObject *py_obj); PyAPI_DATA(PyTypeObject) PyRegistryKey; diff --git a/source4/librpc/ndr/py_security.c b/source4/librpc/ndr/py_security.c index 5311ce18f4..08542640b9 100644 --- a/source4/librpc/ndr/py_security.c +++ b/source4/librpc/ndr/py_security.c @@ -16,9 +16,13 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "../lib/util/python_util.h" +#include #include "libcli/security/security.h" +#ifndef Py_RETURN_NONE +#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None +#endif + static void PyType_AddMethods(PyTypeObject *type, PyMethodDef *methods) { PyObject *dict; diff --git a/source4/librpc/rpc/pyrpc.c b/source4/librpc/rpc/pyrpc.c index 1f29ad143e..371e111c67 100644 --- a/source4/librpc/rpc/pyrpc.c +++ b/source4/librpc/rpc/pyrpc.c @@ -18,13 +18,17 @@ */ #include "includes.h" -#include "../lib/util/python_util.h" +#include #include #include "librpc/rpc/pyrpc.h" #include "librpc/rpc/dcerpc.h" #include "lib/events/events.h" #include "param/pyparam.h" +#ifndef Py_RETURN_NONE +#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None +#endif + static PyObject *py_dcerpc_run_function(dcerpc_InterfaceObject *iface, struct PyNdrRpcMethodDef *md, PyObject *args, PyObject *kwargs) { TALLOC_CTX *mem_ctx; diff --git a/source4/param/pyparam.c b/source4/param/pyparam.c index 1eef02ba39..2d5a584fb2 100644 --- a/source4/param/pyparam.c +++ b/source4/param/pyparam.c @@ -23,7 +23,7 @@ #include "includes.h" #include "param/param.h" #include "param/loadparm.h" -#include "../lib/util/python_util.h" +#include #include "pytalloc.h" /* There's no Py_ssize_t in 2.4, apparently */ @@ -32,6 +32,10 @@ typedef int Py_ssize_t; typedef inquiry lenfunc; #endif +#ifndef Py_RETURN_NONE +#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None +#endif + #define PyLoadparmContext_AsLoadparmContext(obj) py_talloc_get_ptr(obj) PyAPI_DATA(PyTypeObject) PyLoadparmContext; diff --git a/source4/scripting/python/pyglue.c b/source4/scripting/python/pyglue.c index b11b5a5add..a2c4790611 100644 --- a/source4/scripting/python/pyglue.c +++ b/source4/scripting/python/pyglue.c @@ -25,13 +25,17 @@ #include "lib/ldb-samba/ldif_handlers.h" #include "librpc/ndr/libndr.h" #include "version.h" -#include "../lib/util/python_util.h" +#include #include "lib/ldb/pyldb.h" #include "libcli/util/pyerrors.h" #include "libcli/security/security.h" #include "auth/pyauth.h" #include "param/pyparam.h" +#ifndef Py_RETURN_NONE +#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None +#endif + /* FIXME: These should be in a header file somewhere, once we finish moving * away from SWIG .. */ extern struct cli_credentials *cli_credentials_from_py_object(PyObject *py_obj); diff --git a/source4/web_server/wsgi.c b/source4/web_server/wsgi.c index 8ec30a476a..53ba2a2d9b 100644 --- a/source4/web_server/wsgi.c +++ b/source4/web_server/wsgi.c @@ -25,7 +25,11 @@ #include "../lib/util/dlinklist.h" #include "../lib/util/data_blob.h" #include "lib/tls/tls.h" -#include "../lib/util/python_util.h" +#include + +#ifndef Py_RETURN_NONE +#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None +#endif typedef struct { PyObject_HEAD -- cgit