diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-08 12:20:20 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-08 12:20:20 +0100 |
| commit | ba5d6e6d706ebf07640ee24d701255cbb4803525 (patch) | |
| tree | 935e0e1ca2e1ad85ae974e051ba51efce412feb3 /lib | |
| parent | 61a23c5eea2203721a70a4ad41bfdc6cd1d6a2a7 (diff) | |
| download | samba-ba5d6e6d706ebf07640ee24d701255cbb4803525.tar.gz samba-ba5d6e6d706ebf07640ee24d701255cbb4803525.tar.bz2 samba-ba5d6e6d706ebf07640ee24d701255cbb4803525.zip | |
Avoid using a utility header for Python replacements included in Samba,
since this will not be shipped with talloc/tdb/tevent/etc.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tdb/pytdb.c | 6 | ||||
| -rw-r--r-- | lib/tevent/pytevent.c | 7 | ||||
| -rw-r--r-- | lib/util/python_util.h | 31 |
3 files changed, 11 insertions, 33 deletions
diff --git a/lib/tdb/pytdb.c b/lib/tdb/pytdb.c index f2e094423c..15a8d8a3e2 100644 --- 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/tevent/pytevent.c b/lib/tevent/pytevent.c index 756d013ede..5d10554531 100644 --- a/lib/tevent/pytevent.c +++ b/lib/tevent/pytevent.c @@ -16,7 +16,12 @@ along with this program. 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 + #include <tevent.h> #include <stdbool.h> #include <tevent_util.h> diff --git a/lib/util/python_util.h b/lib/util/python_util.h deleted file mode 100644 index 24033a48e7..0000000000 --- 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_ */ |