summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-04 08:56:02 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-04 08:56:02 +0000
commitb7db0d71eae6a9cb3859452032427f70bb5a9c69 (patch)
treee23999d3f8c588866b61fe069062abcf461fb38a
parent53bbf0599f87f2b9db4ab373a28df4b68828d0e4 (diff)
downloadruby-b7db0d71eae6a9cb3859452032427f70bb5a9c69.tar.gz
ruby-b7db0d71eae6a9cb3859452032427f70bb5a9c69.tar.xz
ruby-b7db0d71eae6a9cb3859452032427f70bb5a9c69.zip
merges r20490 from trunk into ruby_1_9_1.
* ext/curses/curses.c (curses_getch): no ISPRINT(). [ruby-core:20294] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20507 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog2
-rw-r--r--ext/curses/curses.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d5b79e0ae..a0608a49d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@ Thu Dec 4 13:56:31 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/curses/curses.c (window_getch): avoid ISPRINT() macro which
has an issue with OpenSolaris. [ruby-core:20189]
+ * ext/curses/curses.c (curses_getch): no ISPRINT(). [ruby-core:20294]
+
* signal.c (ruby_signal): EINVAL from sigaction(2) is not a bug.
Thu Dec 4 11:38:40 2008 Akinori MUSHA <knu@iDaemons.org>
diff --git a/ext/curses/curses.c b/ext/curses/curses.c
index 928c403a8..497842517 100644
--- a/ext/curses/curses.c
+++ b/ext/curses/curses.c
@@ -1110,7 +1110,7 @@ window_getch(VALUE obj)
GetWINDOW(obj, winp);
c = wgetch(winp->window);
if (c == EOF) return Qnil;
- if (ISPRINT(c)) {
+ if (rb_isprint(c)) {
char ch = (char)c;
return rb_locale_str_new(&ch, 1);