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: 16-Oct-2010 03:47:41
Branch: HEAD Handle: 2010101601473901
Modified files:
rpm/lib rpmal.h rpmte.h
rpm/rpmdb rpmtypes.h
Log:
move 'alKey' typedef into common header
Summary:
Revision Changes Path
2.40 +0 -4 rpm/lib/rpmal.h
2.75 +0 -4 rpm/lib/rpmte.h
1.6 +5 -0 rpm/rpmdb/rpmtypes.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/lib/rpmal.h
============================================================================
$ cvs diff -u -r2.39 -r2.40 rpmal.h
--- rpm/lib/rpmal.h 6 Mar 2010 15:31:29 -0000 2.39
+++ rpm/lib/rpmal.h 16 Oct 2010 01:47:40 -0000 2.40
@@ -14,10 +14,6 @@
extern int _rpmal_debug;
/*...@=exportlocal@*/
-/** \ingroup rpmts
- * An added/available package retrieval key.
- */
-typedef /*...@abstract@*/ void * alKey;
#define RPMAL_NOMATCH ((alKey)-1L)
/** \ingroup rpmts
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmte.h
============================================================================
$ cvs diff -u -r2.74 -r2.75 rpmte.h
--- rpm/lib/rpmte.h 15 Oct 2010 18:55:14 -0000 2.74
+++ rpm/lib/rpmte.h 16 Oct 2010 01:47:40 -0000 2.75
@@ -233,10 +233,6 @@
int rpmteHaveTransScript(rpmte te, rpmTag tag)
/*...@*/;
-#else
-
-typedef /*...@abstract@*/ void * alKey;
-
#endif /* _RPMTE_INTERNAL */
#ifdef __cplusplus
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmtypes.h
============================================================================
$ cvs diff -u -r1.5 -r1.6 rpmtypes.h
--- rpm/rpmdb/rpmtypes.h 10 Dec 2009 18:50:11 -0000 1.5
+++ rpm/rpmdb/rpmtypes.h 16 Oct 2010 01:47:39 -0000 1.6
@@ -13,6 +13,11 @@
*/
typedef /*...@abstract@*/ /*...@refcounted@*/ struct rpmts_s * rpmts;
+/** \ingroup rpmts
+ * An added/available package retrieval key.
+ */
+typedef /*...@abstract@*/ void * alKey;
+
/** \ingroup rpmbuild
*/
typedef /*...@abstract@*/ /*...@refcounted@*/ struct Spec_s * Spec;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
