aboutsummaryrefslogtreecommitdiffstats
path: root/URPM.xs
diff options
context:
space:
mode:
authorPer Øyvind Karlsen <peroyvind@mandriva.org>2008-02-28 00:56:39 +0000
committerPer Øyvind Karlsen <peroyvind@mandriva.org>2008-02-28 00:56:39 +0000
commit27f70acbbb663974e567e90df7a54030f7308061 (patch)
tree0ff44728e48d10a45e19c638066c0a99383793ce /URPM.xs
parent95ccfb112016c55b159e351fb0d732ea54ce638f (diff)
downloadperl-URPM-27f70acbbb663974e567e90df7a54030f7308061.tar
perl-URPM-27f70acbbb663974e567e90df7a54030f7308061.tar.gz
perl-URPM-27f70acbbb663974e567e90df7a54030f7308061.tar.bz2
perl-URPM-27f70acbbb663974e567e90df7a54030f7308061.tar.xz
perl-URPM-27f70acbbb663974e567e90df7a54030f7308061.zip
add rpm5 wrapper functions, work in progress, URPM builds now at least :o)
Diffstat (limited to 'URPM.xs')
-rw-r--r--URPM.xs17
1 files changed, 3 insertions, 14 deletions
diff --git a/URPM.xs b/URPM.xs
index de69467..863deb7 100644
--- a/URPM.xs
+++ b/URPM.xs
@@ -36,10 +36,8 @@ static inline void *_free(const void * p) {
}
typedef struct rpmSpec_s * Spec;
#else
-#ifndef RPM_450
-#define rpmtsImportPubkey rpmcliImportPubkey
-#endif
#if !defined(RPM_450) || !defined(RPM_500)
+#define rpmtsImportPubkey rpmcliImportPubkey
#define rpmProblemGetType(p) p->type
#define rpmProblemGetPkgNEVR(p) p->pkgNEVR
#define rpmProblemGetAltNEVR(p) p->altNEVR
@@ -57,16 +55,7 @@ typedef struct rpmSpec_s * Spec;
#include <rpm/rpmlib.h>
#ifdef RPM_500
-# define _RPMTAG_INTERNAL
-#include <rpm/rpmtag.h>
-/* (peroyvind): A bit ugly, work in progress.. */
-#define int_32 uint32_t
-#define uint_16 uint16_t
-#define RPM_NULL_TYPE 0
-#define RPM_CHAR_TYPE RPM_UINT8_TYPE
-#define RPM_INT8_TYPE RPM_UINT8_TYPE
-#define RPM_INT16_TYPE RPM_UINT16_TYPE
-#define RPM_INT32_TYPE RPM_UINT32_TYPE
+#include "rpm5compat.h"
#else
#include <rpm/header.h>
#endif
@@ -3923,7 +3912,7 @@ rpmErrorWriteTo(fd)
CODE:
rpmError_callback_data = fd;
rpmlogSetCallback(rpmError_callback
-#ifdef RPM_ORG
+#if defined(RPM_ORG) || defined(RPM_500)
, NULL
#endif
);