From ba5d6e6d706ebf07640ee24d701255cbb4803525 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
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/librpc/ndr/py_security.c | 6 +++++-
 source4/librpc/rpc/pyrpc.c       | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'source4/librpc')

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 <http://www.gnu.org/licenses/>.
 */
-#include "../lib/util/python_util.h"
+#include <Python.h>
 #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 <Python.h>
 #include <structmember.h>
 #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;
-- 
cgit