From 6b76909f5ef5f279cb73decf83f23d3dbf8adaf8 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Tue, 22 Mar 2011 23:58:21 +0100
Subject: s3-build: only include intl protos where needed.

Guenther
---
 source3/include/proto.h | 7 -------
 source3/intl/lang_tdb.c | 1 +
 source3/intl/lang_tdb.h | 7 +++++++
 source3/lib/dprintf.c   | 1 +
 source3/web/cgi.c       | 1 +
 source3/web/neg_lang.c  | 1 +
 source3/web/swat.c      | 1 +
 7 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 source3/intl/lang_tdb.h

(limited to 'source3')

diff --git a/source3/include/proto.h b/source3/include/proto.h
index c359728064..94f8ad60b4 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -265,13 +265,6 @@ NTSTATUS create_local_nt_token_from_info3(TALLOC_CTX *mem_ctx,
 void debug_unix_user_token(int dbg_class, int dbg_lev, uid_t uid, gid_t gid,
 			   int n_groups, gid_t *groups);
 
-/* The following definitions come from intl/lang_tdb.c  */
-
-bool lang_tdb_init(const char *lang);
-const char *lang_msg(const char *msgid);
-void lang_msg_free(const char *msgstr);
-char *lang_tdb_current(void);
-
 /* The following definitions come from lib/access.c  */
 
 bool client_match(const char *tok, const void *item);
diff --git a/source3/intl/lang_tdb.c b/source3/intl/lang_tdb.c
index 19a50c49f6..8fcb9f2bfc 100644
--- a/source3/intl/lang_tdb.c
+++ b/source3/intl/lang_tdb.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "intl/lang_tdb.h"
 
 static TDB_CONTEXT *tdb;
 
diff --git a/source3/intl/lang_tdb.h b/source3/intl/lang_tdb.h
new file mode 100644
index 0000000000..da246846d0
--- /dev/null
+++ b/source3/intl/lang_tdb.h
@@ -0,0 +1,7 @@
+
+/* The following definitions come from intl/lang_tdb.c  */
+
+bool lang_tdb_init(const char *lang);
+const char *lang_msg(const char *msgid);
+void lang_msg_free(const char *msgstr);
+char *lang_tdb_current(void);
diff --git a/source3/lib/dprintf.c b/source3/lib/dprintf.c
index 73bacdccbb..97129f8b4a 100644
--- a/source3/lib/dprintf.c
+++ b/source3/lib/dprintf.c
@@ -29,6 +29,7 @@
 */
 
 #include "includes.h"
+#include "intl/lang_tdb.h"
 
  int d_vfprintf(FILE *f, const char *format, va_list ap)
 {
diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index c7edf6b27d..c50f92bca7 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -21,6 +21,7 @@
 #include "system/passwd.h"
 #include "system/filesys.h"
 #include "web/swat_proto.h"
+#include "intl/lang_tdb.h"
 
 #define MAX_VARIABLES 10000
 
diff --git a/source3/web/neg_lang.c b/source3/web/neg_lang.c
index f897d10974..59475d12b5 100644
--- a/source3/web/neg_lang.c
+++ b/source3/web/neg_lang.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "web/swat_proto.h"
+#include "intl/lang_tdb.h"
 
 /*
   during a file download we first check to see if there is a language
diff --git a/source3/web/swat.c b/source3/web/swat.c
index b6e5e2ef17..f06bf5ed26 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -34,6 +34,7 @@
 #include "printing/pcap.h"
 #include "printing/load.h"
 #include "passdb.h"
+#include "intl/lang_tdb.h"
 
 static int demo_mode = False;
 static int passwd_only = False;
-- 
cgit