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:   09-Dec-2007 04:57:48
  Branch: rpm-4_5                          Handle: 2007120903574700

  Modified files:           (Branch: rpm-4_5)
    rpm/rpmdb               rpmdb.h

  Log:
    make rpmdb cpp compliant (from spturtle)

  Summary:
    Revision    Changes     Path
    1.57.2.3    +4  -4      rpm/rpmdb/rpmdb.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/rpmdb.h
  ============================================================================
  $ cvs diff -u -r1.57.2.2 -r1.57.2.3 rpmdb.h
  --- rpm/rpmdb/rpmdb.h	30 Jul 2007 12:40:29 -0000	1.57.2.2
  +++ rpm/rpmdb/rpmdb.h	9 Dec 2007 03:57:47 -0000	1.57.2.3
  @@ -596,7 +596,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);
  @@ -620,7 +620,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);
  @@ -645,7 +645,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);
  @@ -669,7 +669,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);
  @@ .