s4-ldb: removed ldb_includes.h

it causes problems with the openchange build as it is not installed

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Mon Nov  1 21:49:47 UTC 2010 on sn-devel-104

diff --git a/source4/lib/ldb/include/ldb_includes.h b/source4/lib/ldb/include/ldb_includes.h
deleted file mode 100644 (file)
index 1bb149a..0000000
--- 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 57d003b8402542ec1cd0a281c66acccb954f30ff..36329a8f50cf8d720877ff8d6cf6a0dcf4c5c500 100644 (file)
--- 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
 
 #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"
 
 #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 672826928665ab89628e8c18e7d672a090a2a487..e028fb20a3f3c77cda139838ff53c1de151b3281 100644 (file)
--- 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
  */
 
  *    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"
 
 #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 61d0d4cdf363d10f2d728b8b29d0ef29a14db6fe..d35e5c604fc3269b51ad789e99e1a07873f31590 100644 (file)
--- 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
  */
 
  *  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"
 
 #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 83eec1d5558c754672c700ba5221cc022037dc4d..da537996d2de4c8150cc4fa4c89ae58d57914b45 100644 (file)
--- 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"
 
 #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 ebed0d2bf943038f16fb8cf61f6e6b47922ef893..206dbd0a8240e0b461ab3a9d87b202719af3eb57 100644 (file)
--- 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"
 
 #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 1ea9e5871fb479bd18b5ac62837c63d08452908b..7faaa9970885ac888dfe1c21c411c7135ffdc496 100644 (file)
--- 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"));
 
 /* 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 8faefc36d0a338bfdc20a259f4b47be354c89727..493c276b138477afd0f5cd080b2da46cf7590914 100644 (file)
--- 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"
 
 #include "tdb.h"
 #include "ldb_module.h"
 

diff --git a/source4/lib/ldb/modules/asq.c b/source4/lib/ldb/modules/asq.c
index ebfafb9556eaf991a7336eca145913cbe046081f..a4b7d200ecaf1db663469709729e407367029b32 100644 (file)
--- a/source4/lib/ldb/modules/asq.c
+++ b/source4/lib/ldb/modules/asq.c
@@ -32,7 +32,9 @@
  *  Author: Simo Sorce
  */
 
  *  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 {
 #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 5e1601c087d80a29b7991d717b391e656992905e..291bfc292ec32d08393febedbe58708b5d476113 100644 (file)
--- a/source4/lib/ldb/modules/paged_results.c
+++ b/source4/lib/ldb/modules/paged_results.c
@@ -32,7 +32,9 @@
  *  Author: Simo Sorce
  */
 
  *  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 {
 #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 d4d7814d73f3eb1e8b6bf9ebda0d4c7b82c1f9b4..68eeb4c76e30fd046683e510d3f6344015aea83c 100644 (file)
--- a/source4/lib/ldb/modules/paged_searches.c
+++ b/source4/lib/ldb/modules/paged_searches.c
@@ -33,7 +33,9 @@
  *  Author: Simo Sorce
  */
 
  *  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
 #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 e27eea50bf505de36ee47e797a98d0b116aa7967..623471a397af277a20b98eb60fc6ad016ce9b12f 100644 (file)
--- a/source4/lib/ldb/modules/rdn_name.c
+++ b/source4/lib/ldb/modules/rdn_name.c
@@ -36,7 +36,9 @@
  *      Simo Sorce Mar 2006
  */
 
  *      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 {
 #include "ldb_module.h"
 
 struct rename_context {

diff --git a/source4/lib/ldb/modules/skel.c b/source4/lib/ldb/modules/skel.c
index e04436f760691d046b046c8295f01d05a788c075..6e00293de389c7d821ac44f02a1844aec9f210ec 100644 (file)
--- a/source4/lib/ldb/modules/skel.c
+++ b/source4/lib/ldb/modules/skel.c
@@ -31,7 +31,9 @@
  *  Author: Simo Sorce
  */
 
  *  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 {
 #include "ldb_module.h"
 
 struct private_data {

diff --git a/source4/lib/ldb/modules/sort.c b/source4/lib/ldb/modules/sort.c
index 0ecba1c714ce08df1c0f38ad5c3d239a24de0e5e..e43b62f9ca3c72ed6a2db6f8cafaf011190f7b75 100644 (file)
--- a/source4/lib/ldb/modules/sort.c
+++ b/source4/lib/ldb/modules/sort.c
@@ -31,7 +31,9 @@
  *  Author: Simo Sorce
  */
 
  *  Author: Simo Sorce
  */
 

-#include "ldb_includes.h"
+#include "replace.h"
+#include "system/filesys.h"
+#include "system/time.h"

 #include "ldb_module.h"
 
 struct opaque {
 #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 8862325c3b4835f3622885c4380bdeaef9bfd1db..3d95d19c085d3cf0e0d9b3f03de7e03f8e36ca72 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
 */
 
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 

-#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)
 #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 01df8ff4e536d41fafdb73cd9f3c6fdd268ec0e0..5ab6dc05bdaa229719d743f7b88154335118a192 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
 */
 
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 

-#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"
 #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 b311073b0529e1b4649f00dc4d340a375b3acf9e..d26f4d1b2115df3834201967ff886a597b456466 100644 (file)
--- a/source4/lib/ldb/tools/ldbedit.c
+++ b/source4/lib/ldb/tools/ldbedit.c
@@ -31,7 +31,9 @@
  *  Author: Andrew Tridgell
  */
 
  *  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"
 #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 458d7115ed3593b7673901c1d3b41afdb75eefa8..6059ac6c5011b27c523be38339db7f14684cc353 100644 (file)
--- a/source4/lib/ldb/tools/ldbsearch.c
+++ b/source4/lib/ldb/tools/ldbsearch.c
@@ -31,7 +31,9 @@
  *  Author: Andrew Tridgell
  */
 
  *  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"
 
 #include "ldb.h"
 #include "tools/cmdline.h"
 

diff --git a/source4/lib/ldb/tools/ldbtest.c b/source4/lib/ldb/tools/ldbtest.c
index 3159bcc2c2e9124b554ef95a2068a39a3c7d98d0..f8035630b965e62c18083ffc885447cfe9fe1f7c 100644 (file)
--- a/source4/lib/ldb/tools/ldbtest.c
+++ b/source4/lib/ldb/tools/ldbtest.c
@@ -31,7 +31,9 @@
  *  Author: Andrew Tridgell
  */
 
  *  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"
 
 #include "ldb.h"
 #include "tools/cmdline.h"