[evolution-data-server/gnome-3-5-3: 3/6] Avoid including <db.h> in a public header file.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server/gnome-3-5-3: 3/6] Avoid including <db.h> in a public header file.
- Date: Sun, 1 Jul 2012 10:30:48 +0000 (UTC)
commit c4692eac2d62084f6332330c91d6f8cba0ea7c68
Author: Matthew Barnes <mbarnes redhat com>
Date: Wed Jun 27 08:15:52 2012 -0400
Avoid including <db.h> in a public header file.
Don't want Berkeley DB to be a requirement in libedata-book.pc.
(cherry picked from commit 938f0348232e4b0b093e413b8371059f96528092)
.../libedata-book/e-book-backend-db-cache.c | 2 ++
.../libedata-book/e-book-backend-db-cache.h | 4 +++-
2 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/addressbook/libedata-book/e-book-backend-db-cache.c b/addressbook/libedata-book/e-book-backend-db-cache.c
index 9b9c055..3e7086d 100644
--- a/addressbook/libedata-book/e-book-backend-db-cache.c
+++ b/addressbook/libedata-book/e-book-backend-db-cache.c
@@ -23,6 +23,8 @@
#include <stdlib.h>
#include <string.h>
+#include <db.h>
+
#include "e-book-backend-db-cache.h"
#include "e-book-backend.h"
#include "e-book-backend-sexp.h"
diff --git a/addressbook/libedata-book/e-book-backend-db-cache.h b/addressbook/libedata-book/e-book-backend-db-cache.h
index 58cf044..b0742ca 100644
--- a/addressbook/libedata-book/e-book-backend-db-cache.h
+++ b/addressbook/libedata-book/e-book-backend-db-cache.h
@@ -27,10 +27,12 @@
#define E_BOOK_BACKEND_DB_CACHE_H
#include <libebook/libebook.h>
-#include "db.h"
G_BEGIN_DECLS
+/* Avoid including <db.h> in a public header file. */
+typedef struct __db DB;
+
EContact * e_book_backend_db_cache_get_contact (DB *db, const gchar *uid);
gchar *e_book_backend_db_cache_get_filename (DB *db);
void e_book_backend_db_cache_set_filename (DB *db, const gchar *filename);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]