From 61a23c5eea2203721a70a4ad41bfdc6cd1d6a2a7 Mon Sep 17 00:00:00 2001
From: Tim Prouty <tprouty@samba.org>
Date: Wed, 7 Jan 2009 14:33:25 -0800
Subject: s3/s4 build: Fix Py_RETURN_NONE to work with python versions < 2.4

---
 lib/tdb/pytdb.c        |  2 +-
 lib/tevent/pytevent.c  |  2 +-
 lib/util/python_util.h | 31 +++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 lib/util/python_util.h

(limited to 'lib')

diff --git a/lib/tdb/pytdb.c b/lib/tdb/pytdb.c
index 88f6f4ef73..f2e094423c 100644
--- a/lib/tdb/pytdb.c
+++ b/lib/tdb/pytdb.c
@@ -24,7 +24,7 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "../lib/util/python_util.h"
 #ifdef HAVE_FSTAT
 #undef HAVE_FSTAT
 #endif
diff --git a/lib/tevent/pytevent.c b/lib/tevent/pytevent.c
index f8e648157d..756d013ede 100644
--- a/lib/tevent/pytevent.c
+++ b/lib/tevent/pytevent.c
@@ -16,7 +16,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "../lib/util/python_util.h"
 #include <tevent.h>
 #include <stdbool.h>
 #include <tevent_util.h>
diff --git a/lib/util/python_util.h b/lib/util/python_util.h
new file mode 100644
index 0000000000..24033a48e7
--- /dev/null
+++ b/lib/util/python_util.h
@@ -0,0 +1,31 @@
+/*
+   Unix SMB/CIFS implementation.
+   Samba Python utility functions
+   Copyright (C) Tim Prouty <tprouty@samba.org> 2009
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _PYTHON_UTIL_H_
+#define _PYTHON_UTIL_H_
+
+#include <Python.h>
+
+#if PY_VERSION_HEX < 0x02040000
+#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
+#define Py_RETURN_TRUE return Py_INCREF(Py_True), Py_True
+#define Py_RETURN_FALSE return Py_INCREF(Py_False), Py_False
+#endif
+
+#endif /* _PYTHON_UTIL_H_ */
-- 
cgit