Commit eef5182b authored by Claes Sjofors's avatar Claes Sjofors

Compiled for BerkeleyDB 5

parent a132267b
...@@ -216,7 +216,7 @@ Init () ...@@ -216,7 +216,7 @@ Init ()
} }
/*open the database*/ /*open the database*/
#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR > 0) #if (DB_VERSION_MAJOR > 3) && (DB_VERSION_MINOR > 0)
ret = dataBaseP->open(dataBaseP, NULL, fname, NULL, DATABASETYPE, DB_CREATE, 0664); ret = dataBaseP->open(dataBaseP, NULL, fname, NULL, DATABASETYPE, DB_CREATE, 0664);
#else #else
ret = dataBaseP->open(dataBaseP, fname, NULL, DATABASETYPE, DB_CREATE, 0664); ret = dataBaseP->open(dataBaseP, fname, NULL, DATABASETYPE, DB_CREATE, 0664);
......
...@@ -985,7 +985,7 @@ static void printstat(DbEnv *ep, const char *s) ...@@ -985,7 +985,7 @@ static void printstat(DbEnv *ep, const char *s)
printf("DbEnv loc statistics, %s:\n", s); printf("DbEnv loc statistics, %s:\n", s);
ep->lock_stat(&lp, 0); ep->lock_stat(&lp, 0);
#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0 #if DB_VERSION_MAJOR > 3 && DB_VERSION_MINOR > 0
printf(" lastid.......: %d\n", lp->st_id); printf(" lastid.......: %d\n", lp->st_id);
#else #else
printf(" lastid.......: %d\n", lp->st_lastid); printf(" lastid.......: %d\n", lp->st_lastid);
...@@ -1002,7 +1002,7 @@ static void printstat(DbEnv *ep, const char *s) ...@@ -1002,7 +1002,7 @@ static void printstat(DbEnv *ep, const char *s)
printf(" maxnobjects..: %d\n", lp->st_maxnobjects); printf(" maxnobjects..: %d\n", lp->st_maxnobjects);
printf(" nrequests....: %u\n", (unsigned int)lp->st_nrequests); printf(" nrequests....: %u\n", (unsigned int)lp->st_nrequests);
printf(" nreleases....: %u\n", (unsigned int)lp->st_nreleases); printf(" nreleases....: %u\n", (unsigned int)lp->st_nreleases);
#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 0 #if DB_VERSION_MAJOR > 3 && DB_VERSION_MINOR == 0
printf(" nnowaits.....: %d\n", lp->st_nnowaits); printf(" nnowaits.....: %d\n", lp->st_nnowaits);
printf(" nconflicts...: %d\n", lp->st_nconflicts); printf(" nconflicts...: %d\n", lp->st_nconflicts);
#endif #endif
...@@ -1113,7 +1113,7 @@ void wb_db::openDb(bool useTxn) ...@@ -1113,7 +1113,7 @@ void wb_db::openDb(bool useTxn)
rc = m_t_class->set_bt_compare(wb_db_class_bt_compare); rc = m_t_class->set_bt_compare(wb_db_class_bt_compare);
#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0 #if DB_VERSION_MAJOR > 3 && DB_VERSION_MINOR > 0
u_int32_t flags; u_int32_t flags;
if (useTxn) flags = DB_CREATE | DB_AUTO_COMMIT; if (useTxn) flags = DB_CREATE | DB_AUTO_COMMIT;
else flags = DB_CREATE; else flags = DB_CREATE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment