summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mdw@samba.org>2014-01-08 15:42:50 +0100
committerMatthias Dieter Wallnöfer <mdw@samba.org>2014-01-09 16:27:47 +0100
commit0c2fbe5a0c1a12751510840e285b7e45cc02ea22 (patch)
tree5f8e515f9d85f9b49b9444ec463775bcf73dd907 /lib
parentd1dacd62bbff93351763ff339cca13ba8180dd89 (diff)
downloadsamba-0c2fbe5a0c1a12751510840e285b7e45cc02ea22.tar.gz
samba-0c2fbe5a0c1a12751510840e285b7e45cc02ea22.tar.xz
samba-0c2fbe5a0c1a12751510840e285b7e45cc02ea22.zip
samba:python - Py_RETURN_NONE remove compatibility code for releases < 2.4
http://www.python.org/doc//current/c-api/none.html Reviewed-By: Jelmer Vernooij <jelmer@samba.org> Autobuild-User(master): Matthias Dieter Wallnöfer <mdw@samba.org> Autobuild-Date(master): Thu Jan 9 16:27:47 CET 2014 on sn-devel-104
Diffstat (limited to 'lib')
-rw-r--r--lib/ldb/pyldb.c4
-rw-r--r--lib/ldb/pyldb_util.c5
-rw-r--r--lib/ntdb/pyntdb.c4
-rw-r--r--lib/socket_wrapper/py_socket_wrapper.c4
-rw-r--r--lib/tdb/pytdb.c4
5 files changed, 0 insertions, 21 deletions
diff --git a/lib/ldb/pyldb.c b/lib/ldb/pyldb.c
index 4583132900..4360b31776 100644
--- a/lib/ldb/pyldb.c
+++ b/lib/ldb/pyldb.c
@@ -64,10 +64,6 @@ typedef inquiry lenfunc;
typedef intargfunc ssizeargfunc;
#endif
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
#define SIGN(a) (((a) == 0)?0:((a) < 0?-1:1))
diff --git a/lib/ldb/pyldb_util.c b/lib/ldb/pyldb_util.c
index e2442e2194..4be9126405 100644
--- a/lib/ldb/pyldb_util.c
+++ b/lib/ldb/pyldb_util.c
@@ -36,11 +36,6 @@ typedef inquiry lenfunc;
typedef intargfunc ssizeargfunc;
#endif
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
-
/**
* Find out PyTypeObject in ldb module for a given typename
*/
diff --git a/lib/ntdb/pyntdb.c b/lib/ntdb/pyntdb.c
index cbe7ae81fa..b2a1f0cbc1 100644
--- a/lib/ntdb/pyntdb.c
+++ b/lib/ntdb/pyntdb.c
@@ -29,10 +29,6 @@
#include "replace.h"
#include "system/filesys.h"
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
/* Include ntdb headers */
#include <ntdb.h>
diff --git a/lib/socket_wrapper/py_socket_wrapper.c b/lib/socket_wrapper/py_socket_wrapper.c
index f5742d3dd1..411be59d5b 100644
--- a/lib/socket_wrapper/py_socket_wrapper.c
+++ b/lib/socket_wrapper/py_socket_wrapper.c
@@ -52,10 +52,6 @@ typedef inquiry lenfunc;
typedef intargfunc ssizeargfunc;
#endif
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
#ifndef Py_TYPE /* Py_TYPE is only available on Python > 2.6 */
#define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)
#endif
diff --git a/lib/tdb/pytdb.c b/lib/tdb/pytdb.c
index cf77a25274..bf0fed6e7b 100644
--- a/lib/tdb/pytdb.c
+++ b/lib/tdb/pytdb.c
@@ -28,10 +28,6 @@
#include "replace.h"
#include "system/filesys.h"
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
/* Include tdb headers */
#include <tdb.h>