r18031: Merge my replace fixes:

[ira/wip.git] / source4 / lib / ldb / include / includes.h

diff --git a/source4/lib/ldb/include/includes.h b/source4/lib/ldb/include/includes.h
index 31997d6008f93531dba31d23d3a79624002a777a..0a73f7728f77680f503b42ff5bd86dcac16406b5 100644 (file)
--- a/source4/lib/ldb/include/includes.h
+++ b/source4/lib/ldb/include/includes.h
@@ -6,19 +6,19 @@
 
 #ifdef _SAMBA_BUILD_
 
-#include "system/filesys.h"
-#include "system/locale.h"
-#include "system/time.h"
-
 /* tell ldb we have the internal ldap code */
 #define HAVE_ILDAP 1
 
-#else /*_SAMBA_BUILD_*/
+#else
+#include "config.h"
+#endif /*_SAMBA_BUILD_*/
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
-#include "config.h"
+#ifdef HAVE_REPLACE_H
+#include "replace.h"
+#endif
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -51,8 +51,6 @@ typedef int (*comparison_fn_t)(const void *, const void *);
 
 #include "talloc.h"
 
-#endif /*_SAMBA_BUILD_*/
-
 #include "ldb.h"
 #include "ldb_errors.h"
 #include "ldb_private.h"