jerenkrantz 01/12/09 12:17:09
Modified: dbm apr_dbm_berkeleydb.c
Log:
Clean up some of the preprocessor conditionals.
Revision Changes Path
1.11 +2 -4 apr-util/dbm/apr_dbm_berkeleydb.c
Index: apr_dbm_berkeleydb.c
===================================================================
RCS file: /home/cvs/apr-util/dbm/apr_dbm_berkeleydb.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- apr_dbm_berkeleydb.c 2001/12/04 17:33:59 1.10
+++ apr_dbm_berkeleydb.c 2001/12/09 20:17:09 1.11
@@ -168,7 +168,7 @@
if ((dberr = (*f->bdb->cursor)(f->bdb, NULL, &f->curs
#if DB_VER == 3
, 0
-#elif ( DB_VERSION_MAJOR == 2 ) && ( DB_VERSION_MINOR > 5)
+#elif (DB_VERSION_MAJOR == 2) && (DB_VERSION_MINOR > 5)
, 0
#endif
@@ -230,9 +230,7 @@
/* ### need to fix. dberr was tossed in db2s(). */
/* ### use db_strerror() */
dbm->errcode = dbm_said;
-#if DB_VER == 1
- dbm->errmsg = NULL;
-#elif DB_VER == 2
+#if DB_VER == 1 || DB_VER == 2
dbm->errmsg = NULL;
#else
dbm->errmsg = db_strerror(dbm_said - APR_OS_START_USEERR);
