From 49e6945ca838737423939272e532221323b22128 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 7 Mar 2006 21:02:11 +0000 Subject: [PATCH] r13990: Fix issues with function renaming. (This used to be commit 988ea27e22e3c0f4daf118151f90db5bb243bffc) --- source4/lib/ldb/common/ldb_modules.c | 4 ++++ source4/lib/ldb/include/includes.h | 2 -- source4/lib/ldb/include/ldb_private.h | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c index 59cf42165b9..2fde859aeb0 100644 --- a/source4/lib/ldb/common/ldb_modules.c +++ b/source4/lib/ldb/common/ldb_modules.c @@ -36,6 +36,10 @@ #include "includes.h" #include "ldb/include/includes.h" +#ifdef _SAMBA_BUILD_ +#include "build.h" +#endif + #define LDB_MODULE_PREFIX "modules:" #define LDB_MODULE_PREFIX_LEN 8 diff --git a/source4/lib/ldb/include/includes.h b/source4/lib/ldb/include/includes.h index 57c207bd74e..c85ffadb6d1 100644 --- a/source4/lib/ldb/include/includes.h +++ b/source4/lib/ldb/include/includes.h @@ -10,8 +10,6 @@ #include "system/iconv.h" #include "system/time.h" -#include "build.h" - /* tell ldb we have the internal ldap code */ #define HAVE_ILDAP 1 diff --git a/source4/lib/ldb/include/ldb_private.h b/source4/lib/ldb/include/ldb_private.h index e241674e4f1..52ea0f833d5 100644 --- a/source4/lib/ldb/include/ldb_private.h +++ b/source4/lib/ldb/include/ldb_private.h @@ -144,7 +144,6 @@ void ldb_debug_set(struct ldb_context *ldb, enum ldb_debug_level level, /* The following definitions come from lib/ldb/common/ldb_ldif.c */ int ldb_should_b64_encode(const struct ldb_val *val); -#ifndef _SAMBA_BUILD_ int ldb_objectclass_init(void); int ldb_operational_init(void); int ldb_paged_results_init(void); @@ -155,7 +154,6 @@ int ldb_ldap_init(void); int ldb_ildap_init(void); int ldb_tdb_init(void); int ldb_sqlite3_init(void); -#endif int ldb_match_msg(struct ldb_context *ldb, struct ldb_message *msg, -- 2.34.1