summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorTim Prouty <tprouty@samba.org>2009-01-07 14:33:25 -0800
committerTim Prouty <tprouty@samba.org>2009-01-07 15:03:16 -0800
commit61a23c5eea2203721a70a4ad41bfdc6cd1d6a2a7 (patch)
treefc1a9fafce0305de010dcb4e45ceb07f1c318314 /source4
parentbed05fbf2e73d4e637e9267c2205feae7ae6440e (diff)
downloadsamba-61a23c5eea2203721a70a4ad41bfdc6cd1d6a2a7.tar.gz
samba-61a23c5eea2203721a70a4ad41bfdc6cd1d6a2a7.tar.bz2
samba-61a23c5eea2203721a70a4ad41bfdc6cd1d6a2a7.zip
s3/s4 build: Fix Py_RETURN_NONE to work with python versions < 2.4
Diffstat (limited to 'source4')
-rw-r--r--source4/auth/credentials/pycredentials.c1
-rw-r--r--source4/lib/com/pycom.c2
-rw-r--r--source4/lib/ldb/pyldb.c1
-rw-r--r--source4/lib/messaging/pymessaging.c2
-rw-r--r--source4/lib/registry/pyregistry.c2
-rw-r--r--source4/librpc/ndr/py_security.c1
-rw-r--r--source4/librpc/rpc/pyrpc.c2
-rw-r--r--source4/param/pyparam.c1
-rw-r--r--source4/scripting/python/pyglue.c2
-rw-r--r--source4/web_server/wsgi.c2
10 files changed, 10 insertions, 6 deletions
diff --git a/source4/auth/credentials/pycredentials.c b/source4/auth/credentials/pycredentials.c
index 903ca2f267..6821170853 100644
--- a/source4/auth/credentials/pycredentials.c
+++ b/source4/auth/credentials/pycredentials.c
@@ -17,6 +17,7 @@
*/
#include "includes.h"
+#include "../lib/util/python_util.h"
#include "pycredentials.h"
#include "param/param.h"
#include "lib/cmdline/credentials.h"
diff --git a/source4/lib/com/pycom.c b/source4/lib/com/pycom.c
index 55f1fd21be..753b7f8f9d 100644
--- a/source4/lib/com/pycom.c
+++ b/source4/lib/com/pycom.c
@@ -18,7 +18,7 @@
*/
#include "includes.h"
-#include <Python.h>
+#include "../lib/util/python_util.h"
#include "lib/com/com.h"
#include "librpc/ndr/libndr.h"
#include "libcli/util/pyerrors.h"
diff --git a/source4/lib/ldb/pyldb.c b/source4/lib/ldb/pyldb.c
index 521fa498aa..b7a78e8f53 100644
--- a/source4/lib/ldb/pyldb.c
+++ b/source4/lib/ldb/pyldb.c
@@ -26,6 +26,7 @@
*/
#include "ldb_includes.h"
+#include "../lib/util/python_util.h"
#include "pyldb.h"
/* There's no Py_ssize_t in 2.4, apparently */
diff --git a/source4/lib/messaging/pymessaging.c b/source4/lib/messaging/pymessaging.c
index 4b092e873a..3fa59bde57 100644
--- a/source4/lib/messaging/pymessaging.c
+++ b/source4/lib/messaging/pymessaging.c
@@ -20,7 +20,7 @@
*/
#include "includes.h"
-#include <Python.h>
+#include "../lib/util/python_util.h"
#include "scripting/python/modules.h"
#include "libcli/util/pyerrors.h"
#include "librpc/rpc/pyrpc.h"
diff --git a/source4/lib/registry/pyregistry.c b/source4/lib/registry/pyregistry.c
index 444b80a6fe..c28fcaa685 100644
--- a/source4/lib/registry/pyregistry.c
+++ b/source4/lib/registry/pyregistry.c
@@ -18,7 +18,7 @@
*/
#include "includes.h"
-#include <Python.h>
+#include "../lib/util/python_util.h"
#include "libcli/util/pyerrors.h"
#include "lib/registry/registry.h"
#include "scripting/python/modules.h" /* for py_iconv_convenience() */
diff --git a/source4/librpc/ndr/py_security.c b/source4/librpc/ndr/py_security.c
index 73837b67ef..5311ce18f4 100644
--- a/source4/librpc/ndr/py_security.c
+++ b/source4/librpc/ndr/py_security.c
@@ -16,6 +16,7 @@
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 "libcli/security/security.h"
static void PyType_AddMethods(PyTypeObject *type, PyMethodDef *methods)
diff --git a/source4/librpc/rpc/pyrpc.c b/source4/librpc/rpc/pyrpc.c
index b841fdad65..1f29ad143e 100644
--- a/source4/librpc/rpc/pyrpc.c
+++ b/source4/librpc/rpc/pyrpc.c
@@ -18,7 +18,7 @@
*/
#include "includes.h"
-#include <Python.h>
+#include "../lib/util/python_util.h"
#include <structmember.h>
#include "librpc/rpc/pyrpc.h"
#include "librpc/rpc/dcerpc.h"
diff --git a/source4/param/pyparam.c b/source4/param/pyparam.c
index f6a0b4f674..1eef02ba39 100644
--- a/source4/param/pyparam.c
+++ b/source4/param/pyparam.c
@@ -23,6 +23,7 @@
#include "includes.h"
#include "param/param.h"
#include "param/loadparm.h"
+#include "../lib/util/python_util.h"
#include "pytalloc.h"
/* There's no Py_ssize_t in 2.4, apparently */
diff --git a/source4/scripting/python/pyglue.c b/source4/scripting/python/pyglue.c
index 6939979f18..b11b5a5add 100644
--- a/source4/scripting/python/pyglue.c
+++ b/source4/scripting/python/pyglue.c
@@ -25,7 +25,7 @@
#include "lib/ldb-samba/ldif_handlers.h"
#include "librpc/ndr/libndr.h"
#include "version.h"
-#include <Python.h>
+#include "../lib/util/python_util.h"
#include "lib/ldb/pyldb.h"
#include "libcli/util/pyerrors.h"
#include "libcli/security/security.h"
diff --git a/source4/web_server/wsgi.c b/source4/web_server/wsgi.c
index 762de55f69..8ec30a476a 100644
--- a/source4/web_server/wsgi.c
+++ b/source4/web_server/wsgi.c
@@ -25,7 +25,7 @@
#include "../lib/util/dlinklist.h"
#include "../lib/util/data_blob.h"
#include "lib/tls/tls.h"
-#include <Python.h>
+#include "../lib/util/python_util.h"
typedef struct {
PyObject_HEAD