summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-01-08 12:20:20 +0100
committerJelmer Vernooij <jelmer@samba.org>2009-01-08 12:20:20 +0100
commitba5d6e6d706ebf07640ee24d701255cbb4803525 (patch)
tree935e0e1ca2e1ad85ae974e051ba51efce412feb3 /source4/lib
parent61a23c5eea2203721a70a4ad41bfdc6cd1d6a2a7 (diff)
downloadsamba-ba5d6e6d706ebf07640ee24d701255cbb4803525.tar.gz
samba-ba5d6e6d706ebf07640ee24d701255cbb4803525.tar.bz2
samba-ba5d6e6d706ebf07640ee24d701255cbb4803525.zip
Avoid using a utility header for Python replacements included in Samba,
since this will not be shipped with talloc/tdb/tevent/etc.
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/com/pycom.c6
-rw-r--r--source4/lib/ldb/pyldb.c6
-rw-r--r--source4/lib/messaging/pymessaging.c6
-rw-r--r--source4/lib/registry/pyregistry.c6
4 files changed, 20 insertions, 4 deletions
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 <Python.h>
#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 <Python.h>
#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 <Python.h>
#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 <Python.h>
#include "libcli/util/pyerrors.h"
#include "lib/registry/registry.h"
#include "scripting/python/modules.h" /* for py_iconv_convenience() */
@@ -26,6 +26,10 @@
#include <tevent.h>
#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;