Avoid using a utility header for Python replacements included in Samba, since this...

Signed-off-by: Stefan Metzmacher <metze@samba.org>

diff --git a/lib/tdb/pytdb.c b/lib/tdb/pytdb.c
index f2e094423cee72271881a1a9f26d039b829f1d59..15a8d8a3e212c0995bf6acc194c4c7e875e23854 100644 (file)
--- a/lib/tdb/pytdb.c
+++ b/lib/tdb/pytdb.c
@@ -24,7 +24,11 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../lib/util/python_util.h"
+#include <Python.h>
+#ifndef Py_RETURN_NONE
+#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
+#endif
+
 #ifdef HAVE_FSTAT
 #undef HAVE_FSTAT
 #endif

diff --git a/lib/util/python_util.h b/lib/util/python_util.h
deleted file mode 100644 (file)
index 24033a4..0000000
--- a/lib/util/python_util.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-   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_ */