aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsuke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-02-23 09:55:33 +0000
committersuke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-02-23 09:55:33 +0000
commit93efbc78bdc3d86088bcd7e7084d60591b95946b (patch)
tree9495e47bfcac3c5c96b3d365dc3daff304bf9f90
parent23ac9d7035a62612c60f344d08cf74439029242c (diff)
downloadruby-93efbc78bdc3d86088bcd7e7084d60591b95946b.tar.gz
* ext/win32ole/win32ole.c (ole_encoding2cp): remove US-ASCII
mapping. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15581 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/win32ole/win32ole.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 59c0701a2e..611ef8c399 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 23 18:50:17 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * ext/win32ole/win32ole.c (ole_encoding2cp): remove US-ASCII
+ mapping.
+
Sat Feb 23 01:09:47 2008 Tanaka Akira <akr@fsij.org>
* process.c (rlimit_resource_type): new function.
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c
index e681f48385..15f8e7ea24 100644
--- a/ext/win32ole/win32ole.c
+++ b/ext/win32ole/win32ole.c
@@ -819,7 +819,6 @@ static UINT ole_encoding2cp(rb_encoding *enc)
ENC_MACHING_CP(enc, "KOI8-R", 20866);
ENC_MACHING_CP(enc, "KOI8-U", 21866);
ENC_MACHING_CP(enc, "Shift_JIS", 932);
- ENC_MACHING_CP(enc, "US-ASCII", 20127);
ENC_MACHING_CP(enc, "UTF-16BE", 1201);
ENC_MACHING_CP(enc, "UTF-16LE", 1200);
ENC_MACHING_CP(enc, "UTF-7", 65000);