diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2007-08-16 11:37:05 +0000 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2007-08-16 11:37:05 +0000 |
| commit | 20e4a25bcf096aa60fc527adf542faa72696edaf (patch) | |
| tree | ec644a8793c3f4c4f9eb8817b7b8545f8b2ace6a /addressbook | |
| parent | 6e34b1e87045b5032142c3e2258fadb37233bea0 (diff) | |
| download | evolution-data-server-20e4a25bcf096aa60fc527adf542faa72696edaf.tar.gz | |
Fix compilation errors caused by glibc's new "open" macro (#466987).
2007-08-16 Matthew Barnes <mbarnes@redhat.com>
* addressbook/backends/file/e-book-backend-file
(e_book_backend_file_load_source):
* libdb/dbm/dbm.c (__db_ndbm_open):
* libedataserver/e-dbhash.c (e_dbhash_new):
Fix compilation errors caused by glibc's new "open" macro (#466987).
svn path=/trunk/; revision=7963
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 5 | ||||
| -rw-r--r-- | addressbook/backends/file/e-book-backend-file.c | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 986b8ee1d..4bdae9da0 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,8 @@ +2007-08-16 Matthew Barnes <mbarnes@redhat.com> + + * backends/file/e-book-backend-file (e_book_backend_file_load_source): + Fix compilation errors caused by glibc's new "open" macro (#466987). + 2007-08-14 Milan Crha <mcrha@redhat.com> ** Fix for bug #356176 by Patrick Ohly diff --git a/addressbook/backends/file/e-book-backend-file.c b/addressbook/backends/file/e-book-backend-file.c index bf8319d88..49a23c6dd 100644 --- a/addressbook/backends/file/e-book-backend-file.c +++ b/addressbook/backends/file/e-book-backend-file.c @@ -1100,7 +1100,7 @@ e_book_backend_file_load_source (EBookBackend *backend, (void *(*)(void *, size_t))g_try_realloc, g_free); - db_error = env->open (env, NULL, DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_THREAD, 0); + db_error = (*env->open) (env, NULL, DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_THREAD, 0); if (db_error != 0) { env->close(env, 0); g_warning ("db_env_open failed with %s", db_strerror (db_error)); @@ -1125,7 +1125,7 @@ e_book_backend_file_load_source (EBookBackend *backend, return db_error_to_status (db_error); } - db_error = db->open (db, NULL, filename, NULL, DB_HASH, DB_THREAD, 0666); + db_error = (*db->open) (db, NULL, filename, NULL, DB_HASH, DB_THREAD, 0666); if (db_error == DB_OLD_VERSION) { db_error = e_db3_utils_upgrade_format (filename); @@ -1137,7 +1137,7 @@ e_book_backend_file_load_source (EBookBackend *backend, return db_error_to_status (db_error); } - db_error = db->open (db, NULL, filename, NULL, DB_HASH, DB_THREAD, 0666); + db_error = (*db->open) (db, NULL, filename, NULL, DB_HASH, DB_THREAD, 0666); } bf->priv->file_db = db; @@ -1154,7 +1154,7 @@ e_book_backend_file_load_source (EBookBackend *backend, g_free (filename); return GNOME_Evolution_Addressbook_OtherError; } - db_error = db->open (db, NULL, filename, NULL, DB_HASH, DB_RDONLY | DB_THREAD, 0666); + db_error = (*db->open) (db, NULL, filename, NULL, DB_HASH, DB_RDONLY | DB_THREAD, 0666); if (db_error != 0 && !only_if_exists) { int rv; @@ -1181,7 +1181,7 @@ e_book_backend_file_load_source (EBookBackend *backend, return GNOME_Evolution_Addressbook_OtherError; } - db_error = db->open (db, NULL, filename, NULL, DB_HASH, DB_CREATE | DB_THREAD, 0666); + db_error = (*db->open) (db, NULL, filename, NULL, DB_HASH, DB_CREATE | DB_THREAD, 0666); if (db_error != 0) { db->close (db, 0); g_warning ("db->open (... DB_CREATE ...) failed with %s", db_strerror (db_error)); |