CVS commit by ossi:
backport: put pointers to bdb open() into parentheses, so they won't be
macro-expanded as libc open.
M +2 -2 drv_maildir.c 1.8.2.5
M +1 -1 mdconvert.c 1.1.2.2
M +1 -1 compat/convert.c 1.1.2.1
--- isync/src/drv_maildir.c #1.8.2.4:1.8.2.5
@@ -500,5 +500,5 @@ maildir_scan( maildir_store_t *ctx, msgl
return DRV_BOX_BAD;
}
- if (tdb->open( tdb, 0, 0, 0, DB_HASH, DB_CREATE, 0 )) {
+ if ((tdb->open)( tdb, 0, 0, 0, DB_HASH, DB_CREATE, 0 ))
{
fputs( "Maildir error: tdb->open() failed\n",
stderr );
tdb->close( tdb, 0 );
@@ -784,5 +784,5 @@ maildir_select( store_t *gctx, int minui
goto bork;
}
- if ((ret = ctx->db->open( ctx->db, 0, uvpath, 0, DB_HASH,
DB_CREATE, 0 ))) {
+ if ((ret = (ctx->db->open)( ctx->db, 0, uvpath, 0, DB_HASH,
DB_CREATE, 0 ))) {
ctx->db->err( ctx->db, ret, "Maildir error:
db->open(%s)", uvpath );
dbork:
--- isync/src/mdconvert.c #1.1.2.1:1.1.2.2
@@ -97,5 +97,5 @@ convert( const char *box, int altmap )
goto tbork;
}
- if ((ret = db->open( db, 0, dbpath, 0, DB_HASH, DB_CREATE, 0 ))) {
+ if ((ret = (db->open)( db, 0, dbpath, 0, DB_HASH, DB_CREATE, 0 ))) {
db->err( db, ret, "Error: db->open(%s)", dbpath );
dbork:
--- isync/src/compat/convert.c #1.1:1.1.2.1
@@ -146,5 +146,5 @@ convert( config_t *box )
goto err2;
}
- if (db->open( db, 0, iumname, 0, DB_HASH, 0, 0 )) {
+ if ((db->open)( db, 0, iumname, 0, DB_HASH, 0, 0 )) {
fputs( "cannot open db\n", stderr );
db->close( db, 0 );
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
isync-devel mailing list
isync-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/isync-devel
