RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs                       Email:  pkarlsen@rpm5.org
  Module: rpm                              Date:   08-Feb-2008 12:41:23
  Branch: HEAD                             Handle: 2008020811412300

  Modified files:
    rpm                     CHANGES
    rpm/rpmdb               rpmdb.h

  Log:
    make rpmdb cpp compliant (from Christiaan Welvaart)

  Summary:
    Revision    Changes     Path
    1.2149      +1  -0      rpm/CHANGES
    1.73        +4  -4      rpm/rpmdb/rpmdb.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2148 -r1.2149 CHANGES
  --- rpm/CHANGES	8 Feb 2008 02:08:39 -0000	1.2148
  +++ rpm/CHANGES	8 Feb 2008 11:41:23 -0000	1.2149
  @@ -1,4 +1,5 @@
   5.0.0 -> 5.1a1:
  +    - proyvind: make rpmdb cpp compliant (from spturtle/Christiaan Welvaart)
       - jbj: "+bing": glob'd directory roots need trailing '/' for DAV URI's.
       - jbj: "+bing": fix: check for glob'd directory roots before traversing.
       - jbj: rpmio: rescuscitate tglob.c.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/rpmdb.h
  ============================================================================
  $ cvs diff -u -r1.72 -r1.73 rpmdb.h
  --- rpm/rpmdb/rpmdb.h	18 Dec 2007 19:40:54 -0000	1.72
  +++ rpm/rpmdb/rpmdb.h	8 Feb 2008 11:41:23 -0000	1.73
  @@ -603,7 +603,7 @@
   	/*@globals fileSystem, internalState @*/
   	/*@modifies dbi, *dbcursor, fileSystem, internalState @*/
   {
  -    void * sw = dbiStatsAccumulator(dbi, 16);	/* RPMTS_OP_DBDEL */
  +    rpmop sw = (rpmop)dbiStatsAccumulator(dbi, 16);	/* RPMTS_OP_DBDEL */
       int rc;
       assert(key->data != NULL && key->size > 0);
       (void) rpmswEnter(sw, 0);
  @@ -627,7 +627,7 @@
   	/*@globals fileSystem, internalState @*/
   	/*@modifies dbi, *dbcursor, *key, *data, fileSystem, internalState @*/
   {
  -    void * sw = dbiStatsAccumulator(dbi, 14);	/* RPMTS_OP_DBGET */
  +    rpmop sw = (rpmop)dbiStatsAccumulator(dbi, 14);	/* RPMTS_OP_DBGET */
       int rc;
       assert((flags == DB_NEXT) || (key->data != NULL && key->size > 0));
       (void) rpmswEnter(sw, 0);
  @@ -652,7 +652,7 @@
   	/*@globals fileSystem, internalState @*/
   	/*@modifies dbi, *dbcursor, *key, *pkey, *data, fileSystem, internalState @*/
   {
  -    void * sw = dbiStatsAccumulator(dbi, 14);	/* RPMTS_OP_DBGET */
  +    rpmop sw = (rpmop)dbiStatsAccumulator(dbi, 14);	/* RPMTS_OP_DBGET */
       int rc;
       assert((flags == DB_NEXT) || (key->data != NULL && key->size > 0));
       (void) rpmswEnter(sw, 0);
  @@ -676,7 +676,7 @@
   	/*@globals fileSystem, internalState @*/
   	/*@modifies dbi, *dbcursor, *key, fileSystem, internalState @*/
   {
  -    void * sw = dbiStatsAccumulator(dbi, 15);	/* RPMTS_OP_DBPUT */
  +    rpmop sw = (rpmop)dbiStatsAccumulator(dbi, 15);	/* RPMTS_OP_DBPUT */
       int rc;
       assert(key->data != NULL && key->size > 0 && data->data != NULL && data->size > 0);
       (void) rpmswEnter(sw, 0);
  @@ .