This is basically the right fix, but with 2 typedef's, there's gonna be a collision eventually.
Add to <rpmdb/rpmtypes.h> with all the other typedef's please. That file SHOULD end up being included everywhere (if not, make it so). The only reason I dinna do this before is that I wanted to rip out rpmalKey, which is an ancient funky compatible retrofit for a a long since *shrug* change. 73 de Jeff On Oct 15, 2010, at 2:55 PM, Per Øyvind Karlsen wrote: > RPM Package Manager, CVS Repository > http://rpm5.org/cvs/ > ____________________________________________________________________________ > > Server: rpm5.org Name: Per Øyvind Karlsen > Root: /v/rpm/cvs Email: pkarl...@rpm5.org > Module: rpm Date: 15-Oct-2010 20:55:48 > Branch: rpm-5_3 Handle: 2010101518554800 > > Modified files: (Branch: rpm-5_3) > rpm/lib rpmte.h > > Log: > add missing 'alKey' typedef for exposed api > > Summary: > Revision Changes Path > 2.73.2.1 +4 -1 rpm/lib/rpmte.h > ____________________________________________________________________________ > > patch -p0 <<'@@ .' > Index: rpm/lib/rpmte.h > ============================================================================ > $ cvs diff -u -r2.73 -r2.73.2.1 rpmte.h > --- rpm/lib/rpmte.h 6 Mar 2010 15:31:29 -0000 2.73 > +++ rpm/lib/rpmte.h 15 Oct 2010 18:55:48 -0000 2.73.2.1 > @@ -6,7 +6,6 @@ > * Structures used for an "rpmte" transaction element. > */ > #include <rpmfi.h> > -#include <rpmal.h> /* XXX alKey */ > > /** > */ > @@ -234,6 +233,10 @@ > int rpmteHaveTransScript(rpmte te, rpmTag tag) > /*...@*/; > > +#else > + > +typedef /*...@abstract@*/ void * alKey; > + > #endif /* _RPMTE_INTERNAL */ > > #ifdef __cplusplus > @@ . > ______________________________________________________________________ > RPM Package Manager http://rpm5.org > CVS Sources Repository rpm-...@rpm5.org ______________________________________________________________________ RPM Package Manager http://rpm5.org Developer Communication List rpm-devel@rpm5.org
