- python: include Python.h before glibc features.h.

CVS patchset: 7055
CVS date: 2004/01/01 16:34:10

diff --git a/python/_rpmdb.c b/python/_rpmdb.c
index d65bb7a..959f398 100644 (file)
--- a/python/_rpmdb.c
+++ b/python/_rpmdb.c
@@ -88,8 +88,8 @@
 
 /* --------------------------------------------------------------------- */
 
-#include <stddef.h>   /* for offsetof() */
 #include <Python.h>
+#include <stddef.h>   /* for offsetof() */
 #include <db.h>
 
 /* --------------------------------------------------------------------- */
@@ -102,7 +102,7 @@
 #endif
 
 #define PY_BSDDB_VERSION "4.2.4"
-static char *rcs_id = "$Id: _rpmdb.c,v 1.11 2003/12/16 03:41:35 jbj Exp $";
+static char *rcs_id = "$Id: _rpmdb.c,v 1.12 2004/01/01 16:34:10 jbj Exp $";
 
 
 #ifdef WITH_THREAD

diff --git a/python/header-py.c b/python/header-py.c
index f4d56c9..6def28c 100644 (file)
--- a/python/header-py.c
+++ b/python/header-py.c
@@ -4,12 +4,6 @@
 
 #include "system.h"
 
-#include "Python.h"
-#ifdef __LCLINT__
-#undef  PyObject_HEAD
-#define PyObject_HEAD   int _PyObjectHead;
-#endif
-
 #include "rpmio_internal.h"
 #include "rpmcli.h"    /* XXX for rpmCheckSig */
 

diff --git a/python/rpmal-py.c b/python/rpmal-py.c
index 05e5277..47b60d1 100644 (file)
--- a/python/rpmal-py.c
+++ b/python/rpmal-py.c
@@ -4,12 +4,6 @@
 
 #include "system.h"
 
-#include "Python.h"
-#ifdef __LCLINT__
-#undef  PyObject_HEAD
-#define PyObject_HEAD   int _PyObjectHead;
-#endif
-
 #include <rpmlib.h>
 
 #include "rpmal-py.h"

diff --git a/python/rpmdb-py.c b/python/rpmdb-py.c
index 945f798..b5251f8 100644 (file)
--- a/python/rpmdb-py.c
+++ b/python/rpmdb-py.c
@@ -4,12 +4,6 @@
 
 #include "system.h"
 
-#include "Python.h"
-#ifdef __LCLINT__
-#undef  PyObject_HEAD
-#define PyObject_HEAD   int _PyObjectHead;
-#endif
-
 #include <rpmlib.h>
 
 #include "rpmdb-py.h"

diff --git a/python/rpmds-py.c b/python/rpmds-py.c
index 13c9493..937f2ba 100644 (file)
--- a/python/rpmds-py.c
+++ b/python/rpmds-py.c
@@ -4,12 +4,6 @@
 
 #include "system.h"
 
-#include "Python.h"
-#ifdef __LCLINT__
-#undef  PyObject_HEAD
-#define PyObject_HEAD   int _PyObjectHead;
-#endif
-
 #include <rpmlib.h>
 
 #include "header-py.h"

diff --git a/python/rpmfd-py.c b/python/rpmfd-py.c
index 5928d6a..472e93e 100644 (file)
--- a/python/rpmfd-py.c
+++ b/python/rpmfd-py.c
@@ -4,12 +4,6 @@
 
 #include "system.h"
 
-#include "Python.h"
-#ifdef __LCLINT__
-#undef  PyObject_HEAD
-#define PyObject_HEAD   int _PyObjectHead;
-#endif
-
 #include <glob.h>      /* XXX rpmio.h */
 #include <dirent.h>    /* XXX rpmio.h */
 #include <rpmio_internal.h>

diff --git a/python/rpmfi-py.c b/python/rpmfi-py.c
index 691ba06..9401395 100644 (file)
--- a/python/rpmfi-py.c
+++ b/python/rpmfi-py.c
@@ -4,12 +4,6 @@
 
 #include "system.h"
 
-#include "Python.h"
-#ifdef __LCLINT__
-#undef  PyObject_HEAD
-#define PyObject_HEAD   int _PyObjectHead;
-#endif
-
 #include <rpmlib.h>
 
 #include "header-py.h"

diff --git a/python/rpmfts-py.c b/python/rpmfts-py.c
index 537ec33..a976943 100644 (file)
--- a/python/rpmfts-py.c
+++ b/python/rpmfts-py.c
@@ -4,7 +4,6 @@
 
 #include "system.h"
 
-#include "Python.h"
 #include "structmember.h"
 
 #ifdef __LCLINT__

diff --git a/python/rpmmi-py.c b/python/rpmmi-py.c
index 4766bbd..8cb63be 100644 (file)
--- a/python/rpmmi-py.c
+++ b/python/rpmmi-py.c
@@ -4,12 +4,6 @@
 
 #include "system.h"
 
-#include "Python.h"
-#ifdef __LCLINT__
-#undef  PyObject_HEAD
-#define PyObject_HEAD   int _PyObjectHead;
-#endif
-
 #include <rpmlib.h>
 #include <rpmdb.h>
 

diff --git a/python/rpmmodule.c b/python/rpmmodule.c
index 7fecd2b..3bc2064 100644 (file)
--- a/python/rpmmodule.c
+++ b/python/rpmmodule.c
@@ -4,12 +4,6 @@
 
 #include "system.h"
 
-#include "Python.h"
-#ifdef __LCLINT__
-#undef  PyObject_HEAD
-#define PyObject_HEAD   int _PyObjectHead;
-#endif
-
 #include <rpmio_internal.h>
 #include <rpmcli.h>    /* XXX for rpmCheckSig */
 #include <rpmdb.h>

diff --git a/python/rpmrc-py.c b/python/rpmrc-py.c
index 14097ce..8671aaf 100644 (file)
--- a/python/rpmrc-py.c
+++ b/python/rpmrc-py.c
@@ -4,12 +4,6 @@
 
 #include "system.h"
 
-#include "Python.h"
-#ifdef __LCLINT__
-#undef  PyObject_HEAD
-#define PyObject_HEAD   int _PyObjectHead;
-#endif
-
 #include "structmember.h"
 
 #include "rpmdebug-py.c"

diff --git a/python/rpmte-py.c b/python/rpmte-py.c
index a004c07..11f5157 100644 (file)
--- a/python/rpmte-py.c
+++ b/python/rpmte-py.c
@@ -4,12 +4,6 @@
 
 #include "system.h"
 
-#include "Python.h"
-#ifdef __LCLINT__
-#undef  PyObject_HEAD
-#define PyObject_HEAD   int _PyObjectHead;
-#endif
-
 #include <rpmlib.h>
 
 #include "header-py.h" /* XXX tagNumFromPyObject */

diff --git a/python/rpmts-py.c b/python/rpmts-py.c
index 4132700..c90092d 100644 (file)
--- a/python/rpmts-py.c
+++ b/python/rpmts-py.c
@@ -4,12 +4,6 @@
 
 #include "system.h"
 
-#include "Python.h"
-#ifdef __LCLINT__
-#undef  PyObject_HEAD
-#define PyObject_HEAD   int _PyObjectHead;
-#endif
-
 #include <rpmcli.h>
 #include <rpmpgp.h>
 #include <rpmdb.h>

diff --git a/python/system.h b/python/system.h
new file mode 100644 (file)
index 0000000..64b813a
--- /dev/null
+++ b/python/system.h
@@ -0,0 +1,17 @@
+/** \ingroup py_c
+ * \file python/system.h
+ */
+
+#ifndef H_SYSTEM_PYTHON
+#define        H_SYSTEM_PYTHON
+
+#include "Python.h"
+
+#ifdef __LCLINT__
+#undef  PyObject_HEAD
+#define PyObject_HEAD   int _PyObjectHead;
+#endif
+
+#include "../system.h"
+
+#endif /* H_SYSTEM_PYTHON */