[SCM] Samba Shared Repository - branch master updated - 58cfb1a9e1470b86f664e489e20cde7af294d07b

[Jelmer Vernooij]

The branch, master has been updated
       via  58cfb1a9e1470b86f664e489e20cde7af294d07b (commit)
      from  4d02bbbfb4d74367bde0f768c02ddb99910ef62d (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 58cfb1a9e1470b86f664e489e20cde7af294d07b
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Dec 23 11:25:06 2008 +0100

    python: Define Py_ssize_t if the Python library doesn't.

-----------------------------------------------------------------------

Summary of changes:
 source4/lib/ldb/pyldb.c |    6 ++++++
 source4/param/pyparam.c |    6 ++++++
 2 files changed, 12 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/ldb/pyldb.c b/source4/lib/ldb/pyldb.c
index a60307c..f4f43a3 100644
--- a/source4/lib/ldb/pyldb.c
+++ b/source4/lib/ldb/pyldb.c
@@ -28,6 +28,12 @@
 #include "ldb_includes.h"
 #include "pyldb.h"
 
+/* There's no Py_ssize_t in 2.4, apparently */
+#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 5
+typedef int Py_ssize_t;
+typedef inquiry lenfunc;
+#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/param/pyparam.c b/source4/param/pyparam.c
index acadcc0..69c2613 100644
--- a/source4/param/pyparam.c
+++ b/source4/param/pyparam.c
@@ -25,6 +25,12 @@
 #include "param/loadparm.h"
 #include "pytalloc.h"
 
+/* There's no Py_ssize_t in 2.4, apparently */
+#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 5
+typedef int Py_ssize_t;
+typedef inquiry lenfunc;
+#endif
+
 #define PyLoadparmContext_AsLoadparmContext(obj) py_talloc_get_ptr(obj)
 
 PyAPI_DATA(PyTypeObject) PyLoadparmContext;


-- 
Samba Shared Repository