aboutsummaryrefslogtreecommitdiff
path: root/intl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-08-02 07:01:41 +0000
committerUlrich Drepper <drepper@redhat.com>2000-08-02 07:01:41 +0000
commitbe18eced55bb0d6431f1cd81df8febbc159ddc86 (patch)
tree5ca3c86709090813f200b6d2abac9e498a071de7 /intl
parentUpdate. (diff)
downloadglibc-be18eced55bb0d6431f1cd81df8febbc159ddc86.tar.gz
glibc-be18eced55bb0d6431f1cd81df8febbc159ddc86.tar.bz2
glibc-be18eced55bb0d6431f1cd81df8febbc159ddc86.zip
Update.
Remove incompatible IPv6 extension of RPC. * sunrpc/Makefile: Undo changes. * sunrpc/rpc_main.c: Likewise. * sunrpc/rpc/clnt.h: Likewise. * sunrpc/rpc/svc.h: Likewise. * sunrpc/bindrsvprt6.c: Removed. * sunrpc/clnt_tcp6.c: Removed. * sunrpc/clnt_udp6.c: Removed. * sunrpc/svc_tcp6.c: Removed. * sunrpc/svc_udp6.c: Removed. * intl/libintl.h: Don't use __attribute_format_arg__ for gettext, dgettext, and dcgettetxt. * intl/locale.alias: Update japanese aliases.
Diffstat (limited to 'intl')
-rw-r--r--intl/libintl.h9
-rw-r--r--intl/locale.alias4
2 files changed, 6 insertions, 7 deletions
diff --git a/intl/libintl.h b/intl/libintl.h
index 70a4706021..e38b5619bf 100644
--- a/intl/libintl.h
+++ b/intl/libintl.h
@@ -31,21 +31,18 @@ __BEGIN_DECLS
/* Look up MSGID in the current default message catalog for the current
LC_MESSAGES locale. If not found, returns MSGID itself (the default
text). */
-extern char *gettext (__const char *__msgid)
- __THROW __attribute_format_arg__ (1);
+extern char *gettext (__const char *__msgid);
/* Look up MSGID in the DOMAINNAME message catalog for the current
LC_MESSAGES locale. */
-extern char *dgettext (__const char *__domainname, __const char *__msgid)
- __THROW __attribute_format_arg__ (2);
+extern char *dgettext (__const char *__domainname, __const char *__msgid);
extern char *__dgettext (__const char *__domainname, __const char *__msgid)
__THROW __attribute_format_arg__ (2);
/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
locale. */
extern char *dcgettext (__const char *__domainname,
- __const char *__msgid, int __category)
- __THROW __attribute_format_arg__ (2);
+ __const char *__msgid, int __category);
extern char *__dcgettext (__const char *__domainname,
__const char *__msgid, int __category)
__THROW __attribute_format_arg__ (2);
diff --git a/intl/locale.alias b/intl/locale.alias
index b908471590..8bd1222937 100644
--- a/intl/locale.alias
+++ b/intl/locale.alias
@@ -47,8 +47,10 @@ hrvatski hr_HR.ISO-8859-2
hungarian hu_HU.ISO-8859-2
icelandic is_IS.ISO-8859-1
italian it_IT.ISO-8859-1
-japanese ja_JP.SJIS
+japanese ja_JP.eucJP
japanese.euc ja_JP.eucJP
+ja_JP ja_JP.eucJP
+japanese.sjis ja_JP.SJIS
lithuanian lt_LT.ISO-8859-13
norwegian no_NO.ISO-8859-1
polish pl_PL.ISO-8859-2