summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--iconvdata/EUC-KR.irreversible2
-rw-r--r--iconvdata/euc-kr.c17
-rw-r--r--iconvdata/testdata/EUC-KR..UTF82
-rw-r--r--linuxthreads/ChangeLog7
-rw-r--r--linuxthreads/sysdeps/unix/sysv/linux/bits/posix_opt.h2
-rw-r--r--linuxthreads/sysdeps/unix/sysv/linux/i386/bits/posix_opt.h2
-rw-r--r--localedata/ChangeLog11
-rw-r--r--localedata/charmaps/EUC-KR2
-rw-r--r--localedata/locales/ko_KR2
10 files changed, 39 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index f0f13d51db..ec6aa702b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-11-08  Ulrich Drepper  <drepper@redhat.com>
+
+	* iconvdata/euc-kr.c (euckr_from_ucs4): Map 0x20a9 to \xa3dc.
+	(BODY from direction): Remove special handling of \x5c.
+	* iconvdata/EUC-KR.irreversible: Adjust for this change.
+	* iconvdata/testdata/EUC-KR..UTF8: Likewise.
+	Reported by Jungshik Shin <jshin@pantheon.yale.edu>.
+
 2000-11-07  Kazumoto Kojima  <kkojima@rr.iij4u.or.jp>
 
 	* sysdeps/sh/sh3/setjmp.S (__sigsetjmp): Skip FPU fields.
diff --git a/iconvdata/EUC-KR.irreversible b/iconvdata/EUC-KR.irreversible
index 4eadbb376c..95aa4d483f 100644
--- a/iconvdata/EUC-KR.irreversible
+++ b/iconvdata/EUC-KR.irreversible
@@ -1 +1 @@
-0x5C	0x005C
+0xA3DC	0x20A9
diff --git a/iconvdata/euc-kr.c b/iconvdata/euc-kr.c
index 0b4e29abe3..5ecdbb8182 100644
--- a/iconvdata/euc-kr.c
+++ b/iconvdata/euc-kr.c
@@ -31,9 +31,12 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp)
     {
       if (__builtin_expect (ch, 0) == 0x20a9)
 	{
-	  /* Half-width Korean Currency WON sign.  */
-	  cp[0] = '\\';
-	  cp[1] = '\0';
+	  /* Half-width Korean Currency WON sign.  There is no
+             equivalent in EUC-KR.  Some mappings use \x5c because
+             this is what some old Korean ASCII variants used but this
+             is causing problems.  We map it to the FULL WIDTH WON SIGN.  */
+	  cp[0] = '\xa3';
+	  cp[1] = '\xdc';
 	}
       else if (__builtin_expect (ucs4_to_ksc5601 (ch, cp, 2), 0)
 	  != __UNKNOWN_10646_CHAR)
@@ -75,13 +78,7 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp)
     uint32_t ch = *inptr;						      \
 									      \
     if (ch <= 0x9f)							      \
-      {									      \
-	/* Plain ASCII with one exception.  */				      \
-	if (ch == 0x5c)							      \
-	  /* Half-width Korean Currency WON sign.  */			      \
-	  ch = 0x20a9;							      \
-	++inptr;							      \
-      }									      \
+      ++inptr;								      \
     /* 0xfe(->0x7e : row 94) and 0xc9(->0x59 : row 41) are		      \
        user-defined areas.  */						      \
     else if (__builtin_expect (ch, 0xa1) == 0xa0			      \
diff --git a/iconvdata/testdata/EUC-KR..UTF8 b/iconvdata/testdata/EUC-KR..UTF8
index b6c484fa11..e287e76c6f 100644
--- a/iconvdata/testdata/EUC-KR..UTF8
+++ b/iconvdata/testdata/EUC-KR..UTF8
@@ -1,7 +1,7 @@
    ! " # $ % & ' ( ) * + , - . /
  0 1 2 3 4 5 6 7 8 9 : ; < = > ?
  @ A B C D E F G H I J K L M N O
- P Q R S T U V W X Y Z [ ₩ ] ^ _
+ P Q R S T U V W X Y Z [ \ ] ^ _
  ` a b c d e f g h i j k l m n o
  p q r s t u v w x y z { | } ~
 
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 830784194b..5bfee849b5 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,10 @@
+2000-11-07  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/bits/posix_opt.h (_POSIX_MESSAGE_PASSING):
+	Don't define it.
+	* sysdeps/unix/sysv/linux/i386/bits/posix_opt.h: Likewise.
+	Reported by Christopher Yeoh <cyeoh@linuxcare.com.au>.
+
 2000-11-06  Ulrich Drepper  <drepper@redhat.com>
 
 	* cancel.c (pthread_cancel): Always set p_canceled, even if we are
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/bits/posix_opt.h b/linuxthreads/sysdeps/unix/sysv/linux/bits/posix_opt.h
index 35f8fefb7b..83c5152e37 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/bits/posix_opt.h
+++ b/linuxthreads/sysdeps/unix/sysv/linux/bits/posix_opt.h
@@ -135,6 +135,6 @@
 #define _POSIX_BARRIERS	200912L
 
 /* POSIX message queues are not yet supported.  */
-#define	_POSIX_MESSAGE_PASSING	(-1)
+#undef	_POSIX_MESSAGE_PASSING
 
 #endif /* posix_opt.h */
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/i386/bits/posix_opt.h b/linuxthreads/sysdeps/unix/sysv/linux/i386/bits/posix_opt.h
index 6446731e26..e290c63cc9 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/i386/bits/posix_opt.h
+++ b/linuxthreads/sysdeps/unix/sysv/linux/i386/bits/posix_opt.h
@@ -141,6 +141,6 @@
 #define _POSIX_BARRIERS	200912L
 
 /* POSIX message queues are not yet supported.  */
-#define	_POSIX_MESSAGE_PASSING	(-1)
+#undef	_POSIX_MESSAGE_PASSING
 
 #endif /* posix_opt.h */
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 8a20d9eae5..69f349c3db 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,14 @@
+2000-11-08  Ulrich Drepper  <drepper@redhat.com>
+
+	* charmaps/EUC-KR: Revert last change.  Backslash maps to backslash.
+	* locales/ko_KR: Revert change.  Use full with won sign.
+	Reported by Jungshik Shin <jshin@pantheon.yale.edu>.
+
+2000-11-07  Ulrich Drepper  <drepper@redhat.com>
+
+	* locales/mk_MK: Update.
+	Patch by Damjan Georgievski <gdamjan@freemail.org.mk>.
+
 2000-11-06  Ulrich Drepper  <drepper@redhat.com>
 
 	* charmaps/BIG5: Add mapping for <U20AC> back.
diff --git a/localedata/charmaps/EUC-KR b/localedata/charmaps/EUC-KR
index 6a4326790c..bf18ea6106 100644
--- a/localedata/charmaps/EUC-KR
+++ b/localedata/charmaps/EUC-KR
@@ -100,7 +100,7 @@ CHARMAP
 <U0059>     /x59         LATIN CAPITAL LETTER Y
 <U005A>     /x5a         LATIN CAPITAL LETTER Z
 <U005B>     /x5b         LEFT SQUARE BRACKET
-<U20A9>     /x5c         WON SIGN
+<U005C>     /x5c         REVERSE SOLIDUS
 <U005D>     /x5d         RIGHT SQUARE BRACKET
 <U005E>     /x5e         CIRCUMFLEX ACCENT
 <U005F>     /x5f         LOW LINE
diff --git a/localedata/locales/ko_KR b/localedata/locales/ko_KR
index 42f9c67af8..04a0ab123a 100644
--- a/localedata/locales/ko_KR
+++ b/localedata/locales/ko_KR
@@ -9664,7 +9664,7 @@ END LC_CTYPE
 LC_MONETARY
 
 int_curr_symbol		"<U004B><U0052><U0057><U0020>"
-currency_symbol		"<U20A9>"
+currency_symbol		"<UFFEC>"
 mon_decimal_point	"<U002E>"
 mon_thousands_sep	"<U002C>"
 mon_grouping		3;3