aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPer Øyvind Karlsen <peroyvind@mandriva.org>2008-02-28 01:06:42 +0000
committerPer Øyvind Karlsen <peroyvind@mandriva.org>2008-02-28 01:06:42 +0000
commit8da017baccff6f8c4bca1e136a7e5fbffab66054 (patch)
tree90a7c125527715e395907ea6af407a3697f7c59f
parent27f70acbbb663974e567e90df7a54030f7308061 (diff)
downloadperl-URPM-8da017baccff6f8c4bca1e136a7e5fbffab66054.tar
perl-URPM-8da017baccff6f8c4bca1e136a7e5fbffab66054.tar.gz
perl-URPM-8da017baccff6f8c4bca1e136a7e5fbffab66054.tar.bz2
perl-URPM-8da017baccff6f8c4bca1e136a7e5fbffab66054.tar.xz
perl-URPM-8da017baccff6f8c4bca1e136a7e5fbffab66054.zip
fix define of _RPMTAG_INTERNAL at right place and drop redundant include of rpmtag.h
-rw-r--r--URPM.xs4
-rw-r--r--rpm5compat.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/URPM.xs b/URPM.xs
index 863deb7..df55e84 100644
--- a/URPM.xs
+++ b/URPM.xs
@@ -8,7 +8,6 @@
* $Id$
*
*/
-
#include "EXTERN.h"
#include "perl.h"
#include "XSUB.h"
@@ -52,6 +51,9 @@ typedef struct rpmSpec_s * Spec;
# define _RPMEVR_INTERNAL
#include <rpm/rpmevr.h>
#endif
+#ifdef RPM_500
+# define _RPMTAG_INTERNAL
+#endif
#include <rpm/rpmlib.h>
#ifdef RPM_500
diff --git a/rpm5compat.h b/rpm5compat.h
index 565e0e9..9d6fd7b 100644
--- a/rpm5compat.h
+++ b/rpm5compat.h
@@ -7,8 +7,6 @@
#include <rpm/rpmio.h>
#include <rpm/pkgio.h>
#include <rpm/rpmcb.h>
-# define _RPMTAG_INTERNAL
-#include <rpm/rpmtag.h>
#include <rpm/rpmts.h>