From 7e23363455703eb24c506a7922ce86e3697fc8cd Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 1 Nov 2010 23:36:42 +1100 Subject: s4-ldb: removed ldb_includes.h it causes problems with the openchange build as it is not installed Autobuild-User: Andrew Tridgell Autobuild-Date: Mon Nov 1 21:49:47 UTC 2010 on sn-devel-104 --- source4/lib/ldb/include/ldb_includes.h | 11 ----------- source4/lib/ldb/include/ldb_private.h | 4 +++- source4/lib/ldb/ldb_ldap/ldb_ldap.c | 4 +++- source4/lib/ldb/ldb_map/ldb_map.c | 4 +++- source4/lib/ldb/ldb_map/ldb_map_inbound.c | 4 +++- source4/lib/ldb/ldb_map/ldb_map_outbound.c | 4 +++- source4/lib/ldb/ldb_map/ldb_map_private.h | 4 +++- source4/lib/ldb/ldb_tdb/ldb_tdb.h | 4 +++- source4/lib/ldb/modules/asq.c | 4 +++- source4/lib/ldb/modules/paged_results.c | 4 +++- source4/lib/ldb/modules/paged_searches.c | 4 +++- source4/lib/ldb/modules/rdn_name.c | 4 +++- source4/lib/ldb/modules/skel.c | 4 +++- source4/lib/ldb/modules/sort.c | 4 +++- source4/lib/ldb/tests/sample_module.c | 4 +++- source4/lib/ldb/tools/cmdline.c | 4 +++- source4/lib/ldb/tools/ldbedit.c | 4 +++- source4/lib/ldb/tools/ldbsearch.c | 4 +++- source4/lib/ldb/tools/ldbtest.c | 4 +++- 19 files changed, 54 insertions(+), 29 deletions(-) delete mode 100644 source4/lib/ldb/include/ldb_includes.h diff --git a/source4/lib/ldb/include/ldb_includes.h b/source4/lib/ldb/include/ldb_includes.h deleted file mode 100644 index 1bb149a03d..0000000000 --- a/source4/lib/ldb/include/ldb_includes.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef _LDB_PRIVATE_INCLUDES_H_ -#define _LDB_PRIVATE_INCLUDES_H_ -/* - a temporary includes file until I work on the ldb build system -*/ - -#include "replace.h" -#include "system/filesys.h" -#include "system/time.h" - -#endif /*_LDB_PRIVATE_INCLUDES_H_*/ diff --git a/source4/lib/ldb/include/ldb_private.h b/source4/lib/ldb/include/ldb_private.h index 57d003b840..36329a8f50 100644 --- a/source4/lib/ldb/include/ldb_private.h +++ b/source4/lib/ldb/include/ldb_private.h @@ -37,7 +37,9 @@ #ifndef _LDB_PRIVATE_H_ #define _LDB_PRIVATE_H_ 1 -#include "ldb_includes.h" +#include "replace.h" +#include "system/filesys.h" +#include "system/time.h" #include "ldb.h" #include "ldb_module.h" diff --git a/source4/lib/ldb/ldb_ldap/ldb_ldap.c b/source4/lib/ldb/ldb_ldap/ldb_ldap.c index 6728269286..e028fb20a3 100644 --- a/source4/lib/ldb/ldb_ldap/ldb_ldap.c +++ b/source4/lib/ldb/ldb_ldap/ldb_ldap.c @@ -38,7 +38,9 @@ * author: Simo Sorce */ -#include "ldb_includes.h" +#include "replace.h" +#include "system/filesys.h" +#include "system/time.h" #include "ldb_module.h" #include "ldb_private.h" diff --git a/source4/lib/ldb/ldb_map/ldb_map.c b/source4/lib/ldb/ldb_map/ldb_map.c index 61d0d4cdf3..d35e5c604f 100644 --- a/source4/lib/ldb/ldb_map/ldb_map.c +++ b/source4/lib/ldb/ldb_map/ldb_map.c @@ -35,7 +35,9 @@ * Author: Jelmer Vernooij, Martin Kuehl */ -#include "ldb_includes.h" +#include "replace.h" +#include "system/filesys.h" +#include "system/time.h" #include "ldb_map.h" #include "ldb_map_private.h" diff --git a/source4/lib/ldb/ldb_map/ldb_map_inbound.c b/source4/lib/ldb/ldb_map/ldb_map_inbound.c index 83eec1d555..da537996d2 100644 --- a/source4/lib/ldb/ldb_map/ldb_map_inbound.c +++ b/source4/lib/ldb/ldb_map/ldb_map_inbound.c @@ -24,7 +24,9 @@ */ -#include "ldb_includes.h" +#include "replace.h" +#include "system/filesys.h" +#include "system/time.h" #include "ldb_map.h" #include "ldb_map_private.h" diff --git a/source4/lib/ldb/ldb_map/ldb_map_outbound.c b/source4/lib/ldb/ldb_map/ldb_map_outbound.c index ebed0d2bf9..206dbd0a82 100644 --- a/source4/lib/ldb/ldb_map/ldb_map_outbound.c +++ b/source4/lib/ldb/ldb_map/ldb_map_outbound.c @@ -25,7 +25,9 @@ */ -#include "ldb_includes.h" +#include "replace.h" +#include "system/filesys.h" +#include "system/time.h" #include "ldb_map.h" #include "ldb_map_private.h" diff --git a/source4/lib/ldb/ldb_map/ldb_map_private.h b/source4/lib/ldb/ldb_map/ldb_map_private.h index 1ea9e5871f..7faaa99708 100644 --- a/source4/lib/ldb/ldb_map/ldb_map_private.h +++ b/source4/lib/ldb/ldb_map/ldb_map_private.h @@ -1,4 +1,6 @@ -#include "ldb_includes.h" +#include "replace.h" +#include "system/filesys.h" +#include "system/time.h" /* A handy macro to report Out of Memory conditions */ #define map_oom(module) ldb_set_errstring(ldb_module_get_ctx(module), talloc_asprintf(module, "Out of Memory")); diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.h b/source4/lib/ldb/ldb_tdb/ldb_tdb.h index 8faefc36d0..493c276b13 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_tdb.h +++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.h @@ -1,4 +1,6 @@ -#include "ldb_includes.h" +#include "replace.h" +#include "system/filesys.h" +#include "system/time.h" #include "tdb.h" #include "ldb_module.h" diff --git a/source4/lib/ldb/modules/asq.c b/source4/lib/ldb/modules/asq.c index ebfafb9556..a4b7d200ec 100644 --- a/source4/lib/ldb/modules/asq.c +++ b/source4/lib/ldb/modules/asq.c @@ -32,7 +32,9 @@ * Author: Simo Sorce */ -#include "ldb_includes.h" +#include "replace.h" +#include "system/filesys.h" +#include "system/time.h" #include "ldb_module.h" struct asq_context { diff --git a/source4/lib/ldb/modules/paged_results.c b/source4/lib/ldb/modules/paged_results.c index 5e1601c087..291bfc292e 100644 --- a/source4/lib/ldb/modules/paged_results.c +++ b/source4/lib/ldb/modules/paged_results.c @@ -32,7 +32,9 @@ * Author: Simo Sorce */ -#include "ldb_includes.h" +#include "replace.h" +#include "system/filesys.h" +#include "system/time.h" #include "ldb_module.h" struct message_store { diff --git a/source4/lib/ldb/modules/paged_searches.c b/source4/lib/ldb/modules/paged_searches.c index d4d7814d73..68eeb4c76e 100644 --- a/source4/lib/ldb/modules/paged_searches.c +++ b/source4/lib/ldb/modules/paged_searches.c @@ -33,7 +33,9 @@ * Author: Simo Sorce */ -#include "ldb_includes.h" +#include "replace.h" +#include "system/filesys.h" +#include "system/time.h" #include "ldb_module.h" #define PS_DEFAULT_PAGE_SIZE 500 diff --git a/source4/lib/ldb/modules/rdn_name.c b/source4/lib/ldb/modules/rdn_name.c index e27eea50bf..623471a397 100644 --- a/source4/lib/ldb/modules/rdn_name.c +++ b/source4/lib/ldb/modules/rdn_name.c @@ -36,7 +36,9 @@ * Simo Sorce Mar 2006 */ -#include "ldb_includes.h" +#include "replace.h" +#include "system/filesys.h" +#include "system/time.h" #include "ldb_module.h" struct rename_context { diff --git a/source4/lib/ldb/modules/skel.c b/source4/lib/ldb/modules/skel.c index e04436f760..6e00293de3 100644 --- a/source4/lib/ldb/modules/skel.c +++ b/source4/lib/ldb/modules/skel.c @@ -31,7 +31,9 @@ * Author: Simo Sorce */ -#include "ldb_includes.h" +#include "replace.h" +#include "system/filesys.h" +#include "system/time.h" #include "ldb_module.h" struct private_data { diff --git a/source4/lib/ldb/modules/sort.c b/source4/lib/ldb/modules/sort.c index 0ecba1c714..e43b62f9ca 100644 --- a/source4/lib/ldb/modules/sort.c +++ b/source4/lib/ldb/modules/sort.c @@ -31,7 +31,9 @@ * Author: Simo Sorce */ -#include "ldb_includes.h" +#include "replace.h" +#include "system/filesys.h" +#include "system/time.h" #include "ldb_module.h" struct opaque { diff --git a/source4/lib/ldb/tests/sample_module.c b/source4/lib/ldb/tests/sample_module.c index 8862325c3b..3d95d19c08 100644 --- a/source4/lib/ldb/tests/sample_module.c +++ b/source4/lib/ldb/tests/sample_module.c @@ -21,7 +21,9 @@ License along with this library; if not, see . */ -#include "ldb_includes.h" +#include "replace.h" +#include "system/filesys.h" +#include "system/time.h" #include "ldb_module.h" int sample_add(struct ldb_module *mod, struct ldb_request *req) diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c index 01df8ff4e5..5ab6dc05bd 100644 --- a/source4/lib/ldb/tools/cmdline.c +++ b/source4/lib/ldb/tools/cmdline.c @@ -21,7 +21,9 @@ License along with this library; if not, see . */ -#include "ldb_includes.h" +#include "replace.h" +#include "system/filesys.h" +#include "system/time.h" #include "ldb_private.h" #include "ldb.h" #include "ldb_module.h" diff --git a/source4/lib/ldb/tools/ldbedit.c b/source4/lib/ldb/tools/ldbedit.c index b311073b05..d26f4d1b21 100644 --- a/source4/lib/ldb/tools/ldbedit.c +++ b/source4/lib/ldb/tools/ldbedit.c @@ -31,7 +31,9 @@ * Author: Andrew Tridgell */ -#include "ldb_includes.h" +#include "replace.h" +#include "system/filesys.h" +#include "system/time.h" #include "system/filesys.h" #include "ldb.h" #include "tools/cmdline.h" diff --git a/source4/lib/ldb/tools/ldbsearch.c b/source4/lib/ldb/tools/ldbsearch.c index 458d7115ed..6059ac6c50 100644 --- a/source4/lib/ldb/tools/ldbsearch.c +++ b/source4/lib/ldb/tools/ldbsearch.c @@ -31,7 +31,9 @@ * Author: Andrew Tridgell */ -#include "ldb_includes.h" +#include "replace.h" +#include "system/filesys.h" +#include "system/time.h" #include "ldb.h" #include "tools/cmdline.h" diff --git a/source4/lib/ldb/tools/ldbtest.c b/source4/lib/ldb/tools/ldbtest.c index 3159bcc2c2..f8035630b9 100644 --- a/source4/lib/ldb/tools/ldbtest.c +++ b/source4/lib/ldb/tools/ldbtest.c @@ -31,7 +31,9 @@ * Author: Andrew Tridgell */ -#include "ldb_includes.h" +#include "replace.h" +#include "system/filesys.h" +#include "system/time.h" #include "ldb.h" #include "tools/cmdline.h" -- cgit