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

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   19-Aug-2007 01:43:55
  Branch: rpm-4_5                          Handle: 2007081900435401

  Modified files:           (Branch: rpm-4_5)
    rpm                     CHANGES
    rpm/rpmdb               db3.c tjfn.c

  Log:
    - prepare for open as a macro in bleeding edge glibc-2.6.90+.

  Summary:
    Revision    Changes     Path
    1.1360.2.33 +1  -0      rpm/CHANGES
    1.64.2.5    +5  -5      rpm/rpmdb/db3.c
    1.4.10.1    +3  -3      rpm/rpmdb/tjfn.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1360.2.32 -r1.1360.2.33 CHANGES
  --- rpm/CHANGES	16 Aug 2007 12:25:47 -0000	1.1360.2.32
  +++ rpm/CHANGES	18 Aug 2007 23:43:54 -0000	1.1360.2.33
  @@ -1,4 +1,5 @@
   4.4.9 -> 4.5:
  +    - jbj: prepare for open as a macro in bleeding edge glibc-2.6.90+.
       - jbj: python: backport signalsCaught, remove archscore.
       - jbj: re-add --force popt alias.
       - jbj: eliminate --initdb.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/db3.c
  ============================================================================
  $ cvs diff -u -r1.64.2.4 -r1.64.2.5 db3.c
  --- rpm/rpmdb/db3.c	27 Jul 2007 18:51:24 -0000	1.64.2.4
  +++ rpm/rpmdb/db3.c	18 Aug 2007 23:43:55 -0000	1.64.2.5
  @@ -521,9 +521,9 @@
   #endif
   
   #if (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR != 0) || (DB_VERSION_MAJOR == 4)
  -    rc = dbenv->open(dbenv, dbhome, eflags, dbi->dbi_perms);
  +    rc = (dbenv->open)(dbenv, dbhome, eflags, dbi->dbi_perms);
   #else
  -    rc = dbenv->open(dbenv, dbhome, NULL, eflags, dbi->dbi_perms);
  +    rc = (dbenv->open)(dbenv, dbhome, NULL, eflags, dbi->dbi_perms);
   #endif
       xx = _debug;
   #if defined(DB_VERSION_MISMATCH)
  @@ -1027,7 +1027,7 @@
   	}
   	    
   	eflags = DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON;
  -	rc = dbenv->open(dbenv, dbhome, eflags, 0);
  +	rc = (dbenv->open)(dbenv, dbhome, eflags, 0);
   	rc = cvtdberr(dbi, "dbenv->open", rc, _debug);
   	if (rc) goto exit;
   
  @@ -1515,10 +1515,10 @@
   #endif
   
   #if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
  -		rc = db->open(db, txnid, dbpath, dbsubfile,
  +		rc = (db->open)(db, txnid, dbpath, dbsubfile,
   		    dbi_type, oflags, dbi->dbi_perms);
   #else
  -		rc = db->open(db, dbpath, dbsubfile,
  +		rc = (db->open)(db, dbpath, dbsubfile,
   		    dbi_type, oflags, dbi->dbi_perms);
   #endif
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/tjfn.c
  ============================================================================
  $ cvs diff -u -r1.4 -r1.4.10.1 tjfn.c
  --- rpm/rpmdb/tjfn.c	1 Dec 2002 21:34:07 -0000	1.4
  +++ rpm/rpmdb/tjfn.c	18 Aug 2007 23:43:55 -0000	1.4.10.1
  @@ -41,7 +41,7 @@
       dbenv->set_errpfx(dbenv, "tjfn");
   
       flags = DB_CREATE | DB_INIT_MPOOL;
  -    if ((ret = dbenv->open(dbenv, home, flags, 0)) != 0)
  +    if ((ret = (dbenv->open)(dbenv, home, flags, 0)) != 0)
   	goto exit;
   
   exit:
  @@ -70,9 +70,9 @@
       }
   
   #if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1)
  -    ret = db->open(db, NULL, dbfn, NULL, DB_BTREE, DB_CREATE, 0664);
  +    ret = (db->open)(db, NULL, dbfn, NULL, DB_BTREE, DB_CREATE, 0664);
   #else
  -    ret = db->open(db, dbfn, NULL, DB_BTREE, DB_CREATE, 0664);
  +    ret = (db->open)(db, dbfn, NULL, DB_BTREE, DB_CREATE, 0664);
   #endif
       if (ret != 0) {
   	db->err(db, ret, "db->open(%s)", dbfn);
  @@ .