diff options
Diffstat (limited to 'chinese/libtabe/files/patch-src::tabe_tsiyindbint.c')
-rw-r--r-- | chinese/libtabe/files/patch-src::tabe_tsiyindbint.c | 48 |
1 files changed, 44 insertions, 4 deletions
diff --git a/chinese/libtabe/files/patch-src::tabe_tsiyindbint.c b/chinese/libtabe/files/patch-src::tabe_tsiyindbint.c index 57e27d85288d..2ba0ab508647 100644 --- a/chinese/libtabe/files/patch-src::tabe_tsiyindbint.c +++ b/chinese/libtabe/files/patch-src::tabe_tsiyindbint.c @@ -1,10 +1,50 @@ ---- src/tabe_tsiyindbint.c.orig Sun Nov 11 12:33:08 2001 -+++ src/tabe_tsiyindbint.c Thu Aug 22 02:16:00 2002 -@@ -270,3 +270,7 @@ +--- src/tabe_tsiyindbint.c.orig Sun Nov 11 20:33:08 2001 ++++ src/tabe_tsiyindbint.c Wed Apr 5 14:30:18 2006 +@@ -87,8 +87,10 @@ + else { + #ifndef HAVE_DB3 + errno = db_open(db_name, DB_BTREE, DB_CREATE, 0644, NULL, NULL, &dbp); +-#else ++#elif (DB_VERSION_MAJOR == 3 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 0)) + errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_CREATE, 0644); ++#else ++ errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_CREATE, 0644); + #endif + } + } +@@ -96,15 +98,19 @@ + if (flags & DB_FLAG_READONLY) { + #ifndef HAVE_DB3 + errno = db_open(db_name, DB_BTREE, DB_RDONLY, 0444, NULL, NULL, &dbp); +-#else ++#elif (DB_VERSION_MAJOR == 3 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 0)) + errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_RDONLY, 0444); ++#else ++ errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_RDONLY, 0444); + #endif + } + else { + #ifndef HAVE_DB3 + errno = db_open(db_name, DB_BTREE, 0, 0644, NULL, NULL, &dbp); +-#else ++#elif (DB_VERSION_MAJOR == 3 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 0)) + errno = dbp->open(dbp, db_name, NULL, DB_BTREE, 0, 0644); ++#else ++ errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, 0, 0644); + #endif + } + } +@@ -268,7 +274,13 @@ + switch(tsiyindb->type) { + case DB_TYPE_DB: dbp = (DB *)tsiyindb->dbp; +#ifndef HAVE_DB3 errno = dbp->stat(dbp, &sp, NULL, 0); -+#else ++#elif (DB_VERSION_MAJOR == 3 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR <= 2)) + errno = dbp->stat(dbp, &sp, 0); ++#else ++ errno = dbp->stat(dbp, NULL, &sp, 0); +#endif if (!errno) { + #ifndef HAVE_DB3 + return(sp->bt_nrecs); |