diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-03-07 21:02:11 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:52:34 -0500 |
| commit | 49e6945ca838737423939272e532221323b22128 (patch) | |
| tree | 9f3c0f408c354706bd5f771018d63c668b78eb6d | |
| parent | 7ffc1b48a4ac5d8e2bfba5b5f5f6f4bea33f3964 (diff) | |
| download | samba-49e6945ca838737423939272e532221323b22128.tar.gz samba-49e6945ca838737423939272e532221323b22128.tar.bz2 samba-49e6945ca838737423939272e532221323b22128.zip | |
r13990: Fix issues with function renaming.
(This used to be commit 988ea27e22e3c0f4daf118151f90db5bb243bffc)
| -rw-r--r-- | source4/lib/ldb/common/ldb_modules.c | 4 | ||||
| -rw-r--r-- | source4/lib/ldb/include/includes.h | 2 | ||||
| -rw-r--r-- | 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 59cf42165b..2fde859aeb 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 57c207bd74..c85ffadb6d 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 e241674e4f..52ea0f833d 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, |