summaryrefslogtreecommitdiff
path: root/source4/librpc
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/librpc
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/librpc')
-rw-r--r--source4/librpc/ndr/py_security.c6
-rw-r--r--source4/librpc/rpc/pyrpc.c6
2 files changed, 10 insertions, 2 deletions
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;