diff options
| author | Chris Toshok <toshok@ximian.com> | 2003-11-25 22:35:11 +0000 |
|---|---|---|
| committer | Chris Toshok <toshok@src.gnome.org> | 2003-11-25 22:35:11 +0000 |
| commit | e3e6ccc1151c184c9b7aa9feccc2c4e66de21f21 (patch) | |
| tree | fb747afc57a555183086b735df7761b58f506d0b /libedataserver | |
| parent | 8641831a507194e39d5246f4ac9ffd750b20c8f9 (diff) | |
| download | evolution-data-server-e3e6ccc1151c184c9b7aa9feccc2c4e66de21f21.tar.gz | |
AC_DISABLE_SHARED.
2003-11-25 Chris Toshok <toshok@ximian.com>
* libdb/dist/configure.ac: AC_DISABLE_SHARED.
* libdb/dist/configure: same.
* libedataserver/e-db3-utils.c: remove the db3 version checks.
* libedataserver/e-dbhash.c: same.
(e_dbhash_new): pass NULL for txn.
Diffstat (limited to 'libedataserver')
| -rw-r--r-- | libedataserver/e-db3-utils.c | 8 | ||||
| -rw-r--r-- | libedataserver/e-dbhash.c | 23 |
2 files changed, 4 insertions, 27 deletions
diff --git a/libedataserver/e-db3-utils.c b/libedataserver/e-db3-utils.c index 3326f32a6..fdbd10503 100644 --- a/libedataserver/e-db3-utils.c +++ b/libedataserver/e-db3-utils.c @@ -4,7 +4,7 @@ #include "e-db3-utils.h" -#include <db.h> +#include "db.h" #include <errno.h> #include <sys/stat.h> @@ -12,12 +12,6 @@ #include <unistd.h> #include <libgnome/gnome-util.h> -#if DB_VERSION_MAJOR != 3 || \ - DB_VERSION_MINOR != 1 || \ - DB_VERSION_PATCH != 17 -#error Including wrong DB3. Need libdb 3.1.17. -#endif - static char * get_check_filename (const char *filename) { diff --git a/libedataserver/e-dbhash.c b/libedataserver/e-dbhash.c index 209798fbc..b429b5872 100644 --- a/libedataserver/e-dbhash.c +++ b/libedataserver/e-dbhash.c @@ -12,15 +12,9 @@ #include <string.h> #include <fcntl.h> -#include <db.h> +#include "db.h" #include "md5-utils.h" -#if DB_VERSION_MAJOR != 3 || \ - DB_VERSION_MINOR != 1 || \ - DB_VERSION_PATCH != 17 -#error Including wrong DB3. Need libdb 3.1.17. -#endif - struct _EDbHashPrivate { DB *db; @@ -33,26 +27,15 @@ e_dbhash_new (const char *filename) DB *db; int rv; - int major, minor, patch; - - db_version (&major, &minor, &patch); - - if (major != 3 || - minor != 1 || - patch != 17) { - g_warning ("Wrong version of libdb."); - return NULL; - } - /* Attempt to open the database */ rv = db_create (&db, NULL, 0); if (rv != 0) { return NULL; } - rv = db->open (db, filename, NULL, DB_HASH, 0, 0666); + rv = db->open (db, NULL, filename, NULL, DB_HASH, 0, 0666); if (rv != 0) { - rv = db->open (db, filename, NULL, DB_HASH, DB_CREATE, 0666); + rv = db->open (db, NULL, filename, NULL, DB_HASH, DB_CREATE, 0666); if (rv != 0) return NULL; |