svn commit: samba r13990 - in branches/SAMBA_4_0/source/lib/ldb: common include

[jelmer at samba.org]

Author: jelmer
Date: 2006-03-07 21:02:11 +0000 (Tue, 07 Mar 2006)
New Revision: 13990

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13990

Log:
Fix issues with function renaming.

Modified:
   branches/SAMBA_4_0/source/lib/ldb/common/ldb_modules.c
   branches/SAMBA_4_0/source/lib/ldb/include/includes.h
   branches/SAMBA_4_0/source/lib/ldb/include/ldb_private.h


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_modules.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/common/ldb_modules.c	2006-03-07 20:52:43 UTC (rev 13989)
+++ branches/SAMBA_4_0/source/lib/ldb/common/ldb_modules.c	2006-03-07 21:02:11 UTC (rev 13990)
@@ -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
 

Modified: branches/SAMBA_4_0/source/lib/ldb/include/includes.h
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/include/includes.h	2006-03-07 20:52:43 UTC (rev 13989)
+++ branches/SAMBA_4_0/source/lib/ldb/include/includes.h	2006-03-07 21:02:11 UTC (rev 13990)
@@ -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
 

Modified: branches/SAMBA_4_0/source/lib/ldb/include/ldb_private.h
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/include/ldb_private.h	2006-03-07 20:52:43 UTC (rev 13989)
+++ branches/SAMBA_4_0/source/lib/ldb/include/ldb_private.h	2006-03-07 21:02:11 UTC (rev 13990)
@@ -144,7 +144,6 @@
 /* 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_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,