diff options
| -rw-r--r-- | source3/python/py_tdbpack.c | 23 | ||||
| -rwxr-xr-x | source3/python/setup.py | 3 |
2 files changed, 18 insertions, 8 deletions
diff --git a/source3/python/py_tdbpack.c b/source3/python/py_tdbpack.c index 8e294c7637..6d23dd840a 100644 --- a/source3/python/py_tdbpack.c +++ b/source3/python/py_tdbpack.c @@ -23,9 +23,18 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "Python.h" +/* This module is supposed to be standalone, however for portability + it would be good to use the FUNCTION_MACRO preprocessor define. */ -#include "Python.h" +#include "config.h" + +#ifdef HAVE_FUNCTION_MACRO +#define FUNCTION_MACRO (__FUNCTION__) +#else +#define FUNCTION_MACRO (__FILE__) +#endif static PyObject * pytdbpack_number(char ch, PyObject *val_iter, PyObject *packed_list); static PyObject * pytdbpack_str(char ch, @@ -511,7 +520,7 @@ static void pytdbunpack_err_too_short(void) { PyErr_Format(PyExc_IndexError, - FUNCTION_MACRO ": data too short for unpack format"); + "%s: data too short for unpack format", FUNCTION_MACRO); } @@ -598,7 +607,7 @@ pytdbunpack_buffer(char **pbuf, int *plen, PyObject *val_list) if (slen < 0) { /* surely you jest */ PyErr_Format(PyExc_ValueError, - FUNCTION_MACRO ": buffer seems to have negative length"); + "%s: buffer seems to have negative length", FUNCTION_MACRO); return NULL; } @@ -608,8 +617,8 @@ pytdbunpack_buffer(char **pbuf, int *plen, PyObject *val_list) if (*plen < slen) { PyErr_Format(PyExc_IndexError, - FUNCTION_MACRO ": not enough data to unpack buffer: " - "need %d bytes, have %d", + "%s: not enough data to unpack buffer: " + "need %d bytes, have %d", FUNCTION_MACRO, (int) slen, *plen); return NULL; } @@ -668,8 +677,8 @@ static PyObject *pytdbunpack_item(char ch, } else { PyErr_Format(PyExc_ValueError, - FUNCTION_MACRO ": format character '%c' is not supported", - ch); + "%s: format character '%c' is not supported", + FUNCTION_MACRO, ch); return NULL; } diff --git a/source3/python/setup.py b/source3/python/setup.py index bf62f3b877..09a81fd914 100755 --- a/source3/python/setup.py +++ b/source3/python/setup.py @@ -179,6 +179,7 @@ setup( # tdbpack/unpack extensions. Does not actually link to any Samba # code, although it implements a compatible data format. Extension(name = "tdbpack", - sources = [os.path.join(samba_srcdir, "python", "py_tdbpack.c")]), + sources = [os.path.join(samba_srcdir, "python", "py_tdbpack.c")], + extra_compile_args = ["-I include"]) ], ) |