Move declarations to header files.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 7d7ca6f6d5895eb9e9b7064b4f587105ad40d0ea..2a72b00af58e80fa78c705645e6b9834bebca09d 100644 (file)
--- 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 d2b306c5d6c6959fdf05a05103caac6c51f08fc4..9ebd70822824f56c05feff9befdc60df3cc7cb6d 100644 (file)
--- 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