diff options
| author | Per Øyvind Karlsen <peroyvind@mandriva.org> | 2008-03-01 12:29:10 +0000 |
|---|---|---|
| committer | Per Øyvind Karlsen <peroyvind@mandriva.org> | 2008-03-01 12:29:10 +0000 |
| commit | a2290efbb395b35330377e0a9acef9b92dab9aeb (patch) | |
| tree | 7f18d5786f51c1e0a76d10121e0f9f1b3216614e | |
| parent | e30262cc17768fcad84c48698666d75e17726071 (diff) | |
| download | perl-URPM-a2290efbb395b35330377e0a9acef9b92dab9aeb.tar perl-URPM-a2290efbb395b35330377e0a9acef9b92dab9aeb.tar.gz perl-URPM-a2290efbb395b35330377e0a9acef9b92dab9aeb.tar.bz2 perl-URPM-a2290efbb395b35330377e0a9acef9b92dab9aeb.tar.xz perl-URPM-a2290efbb395b35330377e0a9acef9b92dab9aeb.zip | |
do better "detection" of callback size without having to define it in Makefile (inspired by apt)
| -rw-r--r-- | Makefile.PL | 3 | ||||
| -rw-r--r-- | URPM.xs | 12 |
2 files changed, 5 insertions, 10 deletions
diff --git a/Makefile.PL b/Makefile.PL index dc16611..6ab4b17 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -50,9 +50,6 @@ if ($pversion ge v4.4.90 && $pversion lt v4.5) { push @rpmflags, '-DRPM_ORG'; } else { # rpm5.org version - if ($pversion ge v4.4.5 && $pversion lt v5.0) { - push @rpmflags, '-DRPM_CALLBACK_LONGLONG'; - } if ($pversion ge v4.4.6) { push @rpmflags, '-DRPM_446'; } @@ -1322,18 +1322,16 @@ ts_nosignature(rpmts ts) { rpmtsSetVSFlags(ts, _RPMVSF_NODIGESTS | _RPMVSF_NOSIGNATURES); } - -#ifdef RPM_CALLBACK_LONGLONG -/* That's for rpm >= 4.4.5 */ -# define RPM_CALLBACK_AMOUNT_TYPE unsigned long long +#if HAVE_RPM_RPMCB_H +typedef unsigned long long rpmCallbackSize_t; #else -# define RPM_CALLBACK_AMOUNT_TYPE unsigned long +typedef unsigned long rpmCallbackSize_t; #endif static void *rpmRunTransactions_callback(const void *h, const rpmCallbackType what, - const RPM_CALLBACK_AMOUNT_TYPE amount, - const RPM_CALLBACK_AMOUNT_TYPE total, + const rpmCallbackSize_t amount, + const rpmCallbackSize_t total, fnpyKey pkgKey, rpmCallbackData data) { static struct timeval tprev; |