summaryrefslogtreecommitdiff
path: root/source4/lib/ldb/include
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-09-04 12:21:42 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:17:05 -0500
commit38fdde5d9bf15b10caa60ee216d278ba8d870c2e (patch)
treef5da0712c3bd704a0af17aa6d12d8c616a2d6e1b /source4/lib/ldb/include
parentf6f4d868ea7d3a01ec28c6855240882911cae039 (diff)
downloadsamba-38fdde5d9bf15b10caa60ee216d278ba8d870c2e.tar.gz
samba-38fdde5d9bf15b10caa60ee216d278ba8d870c2e.tar.bz2
samba-38fdde5d9bf15b10caa60ee216d278ba8d870c2e.zip
r18031: Merge my replace fixes:
* libreplace can now build stand-alone * add stub testsuite for libreplace * make talloc/tdb/ldb use libreplace (This used to be commit fe7ca4b1454e01a33ed0d53791ebffdd349298b4)
Diffstat (limited to 'source4/lib/ldb/include')
-rw-r--r--source4/lib/ldb/include/includes.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/source4/lib/ldb/include/includes.h b/source4/lib/ldb/include/includes.h
index 31997d6008..0a73f7728f 100644
--- 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"