From: Bruno Haible <bruno@clisp.org>
Date: Mon, 6 Nov 2006 12:50:57 +0000 (+0000)
Subject: Move declarations to header files.
X-Git-Tag: v0.17~682
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ddac4fdca10179eaf10c3667e4f8c6c10e1607b;p=thirdparty%2Fgettext.git

Move declarations to header files.
---

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 7d7ca6f6d..2a72b00af 100644
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-03  Bruno Haible  <bruno@clisp.org>
+
+	Move declarations to header files.
+	* dcigettext.c: Include localcharset.h.
+	(get_output_charset): Remove locale_charset declaration.
+
 2006-10-30  Bruno Haible  <bruno@clisp.org>
 
 	Move declarations to header files.
diff --git a/gettext-runtime/intl/dcigettext.c b/gettext-runtime/intl/dcigettext.c
index d2b306c5d..9ebd70822 100644
--- a/gettext-runtime/intl/dcigettext.c
+++ b/gettext-runtime/intl/dcigettext.c
@@ -90,8 +90,11 @@ extern int errno;
 # include <sys/param.h>
 #endif
 
-#if !defined _LIBC && HAVE_NL_LOCALE_NAME
-# include <langinfo.h>
+#if !defined _LIBC
+# if HAVE_NL_LOCALE_NAME
+#  include <langinfo.h>
+# endif
+# include "localcharset.h"
 #endif
 
 #include "gettextP.h"
@@ -1575,7 +1578,6 @@ get_output_charset (struct binding *domainbinding)
 	  return _NL_CURRENT (LC_CTYPE, CODESET);
 # else
 #  if HAVE_ICONV
-	  extern const char *locale_charset (void);
 	  return locale_charset ();
 #  endif
 # endif