summaryrefslogtreecommitdiffstats
path: root/ext/curses
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-10 08:26:36 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-10 08:26:36 +0000
commitea1edc966af6dd39aa5b6eb05a97a30d70d10c91 (patch)
treececb154f054657360e54e8a4e249b804e1231536 /ext/curses
parent9720c588992ee143f66ac6de3adbc9188be256d7 (diff)
downloadruby-ea1edc966af6dd39aa5b6eb05a97a30d70d10c91.tar.gz
ruby-ea1edc966af6dd39aa5b6eb05a97a30d70d10c91.tar.xz
ruby-ea1edc966af6dd39aa5b6eb05a97a30d70d10c91.zip
* io.c (read_all): should return given string even if data read is
empty. [ruby-dev:22207] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5159 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/curses')
-rw-r--r--ext/curses/curses.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/ext/curses/curses.c b/ext/curses/curses.c
index 2e60b2160..106c43da4 100644
--- a/ext/curses/curses.c
+++ b/ext/curses/curses.c
@@ -621,7 +621,7 @@ curses_pair_number(VALUE obj, VALUE attrs)
{
return INT2FIX(PAIR_NUMBER(NUM2INT(attrs)));
}
-#endif
+#endif /* USE_COLOR */
#ifdef USE_MOUSE
struct mousedata {
@@ -1443,7 +1443,7 @@ Init_curses()
#endif /* USE_COLOR */
#ifdef USE_MOUSE
rb_define_module_function(mCurses, "getmouse", curses_getmouse, 0);
- rb_define_module_function(mCurses, "ungetmouse", curses_getmouse, 1);
+ rb_define_module_function(mCurses, "ungetmouse", curses_ungetmouse, 1);
rb_define_module_function(mCurses, "mouseinterval", curses_mouseinterval, 1);
rb_define_module_function(mCurses, "mousemask", curses_mousemask, 1);
#endif /* USE_MOUSE */
@@ -1489,14 +1489,12 @@ Init_curses()
rb_define_method(cWindow, "keypad", window_keypad, 1);
rb_define_method(cWindow, "keypad=", window_keypad, 1);
-#ifdef USE_COLOR
rb_define_method(cWindow, "attroff", window_attroff, 1);
rb_define_method(cWindow, "attron", window_attron, 1);
rb_define_method(cWindow, "attrset", window_attrset, 1);
rb_define_method(cWindow, "bkgdset", window_bkgdset, 1);
rb_define_method(cWindow, "bkgd", window_bkgd, 1);
rb_define_method(cWindow, "getbkgd", window_getbkgd, 0);
-#endif /* USE_COLOR */
rb_define_method(cWindow, "nodelay=", window_nodelay, 1);
rb_define_method(cWindow, "timeout=", window_timeout, 1);