From 431a6bc687af4daa00dec976659c68e0b2a7722c Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Thu, 30 Aug 2007 17:06:14 +0300 Subject: [PATCH] Get rpmcli.h includes out of python bindings --- python/header-py.c | 2 +- python/header-py.h | 2 ++ python/rpmdebug-py.c | 2 -- python/rpmmodule.c | 1 - python/rpmrc-py.c | 4 +--- 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/python/header-py.c b/python/header-py.c index ff23316..2c42ba8 100644 --- a/python/header-py.c +++ b/python/header-py.c @@ -5,7 +5,7 @@ #include "system.h" #include "rpmio_internal.h" -#include "rpmcli.h" /* XXX for rpmCheckSig */ +#include "rpmlib.h" #include "legacy.h" #include "misc.h" diff --git a/python/header-py.h b/python/header-py.h index 7c470f0..20aa8b1 100644 --- a/python/header-py.h +++ b/python/header-py.h @@ -1,6 +1,8 @@ #ifndef RPMPYTHON_HEADER #define RPMPYTHON_HEADER +#include + /** \ingroup py_c * \file python/header-py.h */ diff --git a/python/rpmdebug-py.c b/python/rpmdebug-py.c index 1ddab21..8a78107 100644 --- a/python/rpmdebug-py.c +++ b/python/rpmdebug-py.c @@ -6,8 +6,6 @@ extern PyTypeObject PyDictIter_Type; /*@unchecked@*/ extern PyTypeObject PyFrame_Type; -#include /* XXX debug only */ - #include "header-py.h" /* XXX debug only */ #include "rpmal-py.h" /* XXX debug only */ #include "rpmds-py.h" /* XXX debug only */ diff --git a/python/rpmmodule.c b/python/rpmmodule.c index 2a0ee11..343e26a 100644 --- a/python/rpmmodule.c +++ b/python/rpmmodule.c @@ -5,7 +5,6 @@ #include "system.h" #include -#include /* XXX for rpmCheckSig */ #include #include diff --git a/python/rpmrc-py.c b/python/rpmrc-py.c index 458e827..ead1a92 100644 --- a/python/rpmrc-py.c +++ b/python/rpmrc-py.c @@ -7,10 +7,8 @@ #include "structmember.h" #include "rpmdebug-py.c" - -#include - #include "rpmrc-py.h" +#include "rpmmacro.h" #include "debug.h" -- 2.7.4