[evolution-data-server/evolution-data-server-3-12] Remove libdb related headers from libebackend.h



commit d26fe54f0c7fbf3f3d637256a73531f93474a024
Author: Milan Crha <mcrha redhat com>
Date:   Mon Jul 7 07:58:09 2014 +0200

    Remove libdb related headers from libebackend.h
    
    This is about e-db3-utils.h and e-dbhash.h files, which might not be
    available when the evolution-data-server is compiled without libdb.
    These headers might be included separately now.

 .../file/e-book-backend-file-migrate-bdb.c         |    1 +
 libebackend/e-db3-utils.h                          |    4 ----
 libebackend/e-dbhash.h                             |    4 ----
 libebackend/libebackend.h                          |    2 --
 4 files changed, 1 insertions(+), 10 deletions(-)
---
diff --git a/addressbook/backends/file/e-book-backend-file-migrate-bdb.c 
b/addressbook/backends/file/e-book-backend-file-migrate-bdb.c
index 61d9c41..47e4838 100644
--- a/addressbook/backends/file/e-book-backend-file-migrate-bdb.c
+++ b/addressbook/backends/file/e-book-backend-file-migrate-bdb.c
@@ -38,6 +38,7 @@
 #include <glib/gi18n-lib.h>
 
 #include <libedata-book/libedata-book.h>
+#include <libebackend/e-db3-utils.h>
 
 #include "e-book-backend-file-migrate-bdb.h"
 
diff --git a/libebackend/e-db3-utils.h b/libebackend/e-db3-utils.h
index 20d4485..f61f2e8 100644
--- a/libebackend/e-db3-utils.h
+++ b/libebackend/e-db3-utils.h
@@ -8,10 +8,6 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
-#if !defined (__LIBEBACKEND_H_INSIDE__) && !defined (LIBEBACKEND_COMPILATION)
-#error "Only <libebackend/libebackend.h> should be included directly."
-#endif
-
 #ifndef __E_DB3_UTILS_H__
 #define __E_DB3_UTILS_H__
 
diff --git a/libebackend/e-dbhash.h b/libebackend/e-dbhash.h
index 6e87f4f..9b1643b 100644
--- a/libebackend/e-dbhash.h
+++ b/libebackend/e-dbhash.h
@@ -8,10 +8,6 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
-#if !defined (__LIBEBACKEND_H_INSIDE__) && !defined (LIBEBACKEND_COMPILATION)
-#error "Only <libebackend/libebackend.h> should be included directly."
-#endif
-
 #ifndef EDS_DISABLE_DEPRECATED
 
 #ifndef E_DBHASH_H
diff --git a/libebackend/libebackend.h b/libebackend/libebackend.h
index 8532c14..f9d5023 100644
--- a/libebackend/libebackend.h
+++ b/libebackend/libebackend.h
@@ -31,8 +31,6 @@
 #include <libebackend/e-collection-backend-factory.h>
 #include <libebackend/e-collection-backend.h>
 #include <libebackend/e-data-factory.h>
-#include <libebackend/e-db3-utils.h>
-#include <libebackend/e-dbhash.h>
 #include <libebackend/e-dbus-server.h>
 #include <libebackend/e-extensible.h>
 #include <libebackend/e-extension.h>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]