diff options
| -rw-r--r-- | python/_rpmdb.c | 4 | ||||
| -rw-r--r-- | python/header-py.c | 6 | ||||
| -rw-r--r-- | python/rpmal-py.c | 6 | ||||
| -rw-r--r-- | python/rpmdb-py.c | 6 | ||||
| -rw-r--r-- | python/rpmds-py.c | 6 | ||||
| -rw-r--r-- | python/rpmfd-py.c | 6 | ||||
| -rw-r--r-- | python/rpmfi-py.c | 6 | ||||
| -rw-r--r-- | python/rpmfts-py.c | 1 | ||||
| -rw-r--r-- | python/rpmmi-py.c | 6 | ||||
| -rw-r--r-- | python/rpmmodule.c | 6 | ||||
| -rw-r--r-- | python/rpmrc-py.c | 6 | ||||
| -rw-r--r-- | python/rpmte-py.c | 6 | ||||
| -rw-r--r-- | python/rpmts-py.c | 6 | ||||
| -rw-r--r-- | python/system.h | 17 |
14 files changed, 19 insertions, 69 deletions
diff --git a/python/_rpmdb.c b/python/_rpmdb.c index d65bb7ac0..959f398e1 100644 --- 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 f4d56c9a4..6def28c69 100644 --- 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 05e5277c1..47b60d12e 100644 --- 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 945f79853..b5251f8de 100644 --- 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 13c94936b..937f2bac0 100644 --- 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 5928d6a40..472e93ee7 100644 --- 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 691ba0639..940139541 100644 --- 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 537ec3381..a97694388 100644 --- 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 4766bbdb9..8cb63be75 100644 --- 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 7fecd2bfb..3bc20647d 100644 --- 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 14097ce20..8671aaf35 100644 --- 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 a004c07b8..11f515707 100644 --- 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 4132700f7..c90092d78 100644 --- 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 index 000000000..64b813aea --- /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 */ |