From 2f7f7bc65803510cdf137bde00fdb72c918af63c Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 16 Jun 2003 17:18:06 +0000
Subject: Update.

2003-06-16  Thorsten Kukuk  <kukuk@suse.de>

	* include/libc-symbols.h: Add static_link_warning macro.
	* grp/initgroups.c: Print linker warning if this function
	is called in a static linked binary.
	* nss/getXXbyYY.c: Likewise.
	* nss/getXXbyYY_r.c: Likewise.
	* nss/getXXent.c: Likewise.
	* nss/getXXent_r.c: Likewise.
	* sysdeps/posix/getaddrinfo.c: Likewise.

2003-06-16  Bruno Haible  <bruno@clisp.org>

	* iconvdata/gconv-modules (ISO-8859-15): Add aliases ISO_8859-15,
	LATIN-9.
	(ISO-8859-16): Add aliases ISO_8859-16:2001, ISO_8859-16.
	(IBM1047): Add alias IBM-1047.
	(GBK): Add aliases MS936, WINDOWS-936.

2003-06-16  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/unix/sysv/linux/xstatconv.c (__xstat_conv): Define even if
	defined __ASSUME_STAT64_SYSCALL && defined XSTAT_IS_XSTAT64.
	(__xstat64_conv): Change xstat_conv to __xstat_conv.

	Reported by Arnaud Desitter <arnaud.desitter@geography.oxford.ac.uk>.
---
 localedata/charmaps/GBK | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'localedata/charmaps/GBK')

diff --git a/localedata/charmaps/GBK b/localedata/charmaps/GBK
index 285d18384e..4c35f1426c 100644
--- a/localedata/charmaps/GBK
+++ b/localedata/charmaps/GBK
@@ -4,6 +4,9 @@
 <comment_char> %
 <escape_char> /
 
+% alias CP936
+% alias MS936
+% alias WINDOWS-936
 CHARMAP
 <U0000>     /x00         NULL (NUL)
 <U0001>     /x01         START OF HEADING (SOH)
-- 
cgit v1.2.3-70-g09d2