Update.

2000-05-08  Andreas Jaeger  <aj@suse.de>

	* include/libintl.h: Add prototype for __bind_textdomain_codeset.

	* intl/bindtextdom.c (set_binding_values): Add prototype.

diff --git a/ChangeLog b/ChangeLog
index b454fb5109acbf460deea8fd14ceff46048565d4..f7e5a488d1f552632f59bf928642fe18eac01d73 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-08  Andreas Jaeger  <aj@suse.de>
+
+       * include/libintl.h: Add prototype for __bind_textdomain_codeset.
+
+       * intl/bindtextdom.c (set_binding_values): Add prototype.
+
 2000-05-08  Jakub Jelinek  <jakub@redhat.com>
 
        * sysdeps/alpha/dl-machine.h (elf_machine_rela): Fix arguments in

diff --git a/include/libintl.h b/include/libintl.h
index 3d1d7c90eea2a6464425a8fa923981a9a2a01754..2da639d40d72e94d511b51fc8af02228c4c4d210 100644 (file)
--- a/include/libintl.h
+++ b/include/libintl.h
@@ -10,6 +10,8 @@ extern char *__dcgettext (__const char *__domainname,
 extern char *__textdomain (__const char *__domainname);
 extern char *__bindtextdomain (__const char *__domainname,
                               __const char *__dirname);
+extern char *__bind_textdomain_codeset (__const char *__domainname,
+                                       __const char *__codeset);
 extern const char _libc_intl_domainname[];
 
 /* Define the macros `_' and `N_' for conveniently marking translatable

diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
index 3d49344aaf8410c40b21fdb61ac379d4fa32ed41..4ea368da00acdaa4996d228a1816bdf80c410d99 100644 (file)
--- a/intl/bindtextdom.c
+++ b/intl/bindtextdom.c
@@ -84,6 +84,10 @@ __libc_rwlock_define (extern, _nl_state_lock)
 # define BIND_TEXTDOMAIN_CODESET bind_textdomain_codeset__
 #endif
 
+/* Prototypes for local functions.  */
+static void set_binding_values (const char *domainname, const char **dirnamep,
+                               const char **codesetp);
+     
 /* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP
    to be used for the DOMAINNAME message catalog.
    If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not