[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  f1b21be param: Only include param_proto.h for Samba builds, provide those prototypes necessary for external users (OpenChange) manually.
      from  95a0b68 s3: Fix a typo

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f1b21bee16258a85ab9a12a6a56a1cedda0955e1
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Sep 13 20:40:19 2010 +0200

    param: Only include param_proto.h for Samba builds, provide those
    prototypes necessary for external users (OpenChange) manually.

-----------------------------------------------------------------------

Summary of changes:
 source4/param/param.h       |    6 ++++++
 source4/param/wscript_build |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/param/param.h b/source4/param/param.h
index 7441493..93c7594 100644
--- a/source4/param/param.h
+++ b/source4/param/param.h
@@ -69,7 +69,13 @@ struct smbcli_options;
 struct smbcli_session_options;
 struct gensec_settings;
 
+#ifdef CONFIG_H_IS_FROM_SAMBA
 #include "param/param_proto.h"
+#endif
+
+const char **lpcfg_interfaces(struct loadparm_context *);
+const char *lpcfg_realm(struct loadparm_context *);
+const char *lpcfg_netbios_name(struct loadparm_context *);
 
 void reload_charcnv(struct loadparm_context *lp_ctx);
 
diff --git a/source4/param/wscript_build b/source4/param/wscript_build
index 0f0f1d0..749aab3 100644
--- a/source4/param/wscript_build
+++ b/source4/param/wscript_build
@@ -7,7 +7,7 @@ bld.SAMBA_LIBRARY('LIBSAMBA-HOSTCONFIG',
 	deps='DYNCONFIG CHARSET',
 	public_deps='LIBSAMBA-UTIL',
 	public_headers='param.h',
-        autoproto='param_proto.h'                 
+	autoproto='param_proto.h',
 	)
 
 


-- 
Samba Shared Repository