summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Slebodnik <lslebodn@redhat.com>2015-02-09 19:33:44 +0100
committerJakub Hrozek <jhrozek@redhat.com>2015-02-25 08:38:27 +0100
commit03e9d9d6c1d8768a6f70217bababd82de29bc770 (patch)
tree54d1b41320af7f8e004ab531225e403190f5f33f
parenta63b368a025a61edf41a3d5ce34f325b03295cf6 (diff)
downloadsssd-03e9d9d6c1d8768a6f70217bababd82de29bc770.tar.gz
sssd-03e9d9d6c1d8768a6f70217bababd82de29bc770.tar.xz
sssd-03e9d9d6c1d8768a6f70217bababd82de29bc770.zip
UTIL: Remove compatibility macro PyModule_AddIntMacro
The macro PyModule_AddIntMacro is defined in python >= 2.6 Reviewed-by: Stephen Gallagher <sgallagh@redhat.com>
-rw-r--r--src/external/python.m42
-rw-r--r--src/util/sss_python.h5
2 files changed, 1 insertions, 6 deletions
diff --git a/src/external/python.m4 b/src/external/python.m4
index e93f85009..ac427268d 100644
--- a/src/external/python.m4
+++ b/src/external/python.m4
@@ -63,7 +63,7 @@ AC_DEFUN([AM_CHECK_PYTHON_COMPAT],
LIBS="$LIBS $PYTHON_LIBS"
AC_CHECK_FUNCS([PyErr_NewExceptionWithDoc])
- AC_CHECK_DECLS([PyModule_AddIntMacro, PyUnicode_FromString], [], [], [[#include <Python.h>]])
+ AC_CHECK_DECLS([PyUnicode_FromString], [], [], [[#include <Python.h>]])
CPPFLAGS="$save_CPPFLAGS"
LIBS="$save_LIBS"
diff --git a/src/util/sss_python.h b/src/util/sss_python.h
index 56c25ebb7..5521aa5cf 100644
--- a/src/util/sss_python.h
+++ b/src/util/sss_python.h
@@ -32,11 +32,6 @@ PyObject *sss_python_unicode_from_string(const char *u);
PyObject *
sss_exception_with_doc(char *name, char *doc, PyObject *base, PyObject *dict);
-/* PyModule_AddIntMacro() compatibility */
-#if !HAVE_DECL_PYMODULE_ADDINTMACRO
-#define PyModule_AddIntMacro(m, c) PyModule_AddIntConstant(m, sss_py_const_p(char, #c), c)
-#endif
-
/* Convenience macros */
#define TYPE_READY(module, type, name) do { \
if (PyType_Ready(&type) < 0) \