diff options
Diffstat (limited to 'kbabel/kbabeldict/modules')
-rw-r--r-- | kbabel/kbabeldict/modules/dbsearchengine/configure.in.in | 5 | ||||
-rw-r--r-- | kbabel/kbabeldict/modules/dbsearchengine/database.cpp | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/configure.in.in b/kbabel/kbabeldict/modules/dbsearchengine/configure.in.in index fbc3f1a8..b025015f 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/configure.in.in +++ b/kbabel/kbabeldict/modules/dbsearchengine/configure.in.in @@ -53,8 +53,13 @@ db->open( db, NULL, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 ); db->open( db, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 ); #endif #else +#if DB_VERSION_MAJOR >= 5 +DB *db; +db->open( db, NULL, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 ); +#else error #endif +#endif ], kde_cv_berk_database=$1 ) diff --git a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp index 05f31654..95ec19dd 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp @@ -740,7 +740,7 @@ int DataBaseManager::count () { DB_BTREE_STAT *dstat = 0; -#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3 +#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3) || (DB_VERSION_MAJOR >= 5) db->stat (db, NULL, &dstat, DB_FAST_STAT); #else db->stat (db, &dstat, DB_FAST_STAT); @@ -979,7 +979,7 @@ DataBaseManager::loadInfo () int nrec; DB_BTREE_STAT *stat; // memset(&stat,0,sizeof(DB_BTREE_STAT)); -#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3 +#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3) || (DB_VERSION_MAJOR >= 5) if (infoDb->stat (infoDb, NULL, &stat, DB_FAST_STAT)) fprintf (stderr, "Cannot stat\n"); #else |