From 37859b522727f99e76ab0878822ae4b0bc412bed Mon Sep 17 00:00:00 2001 From: yugui Date: Fri, 17 Jul 2009 15:26:30 +0000 Subject: * ext/readline/readline.c (Init_readline): rl_catch_signals does not exist on some platform like Mac OS X 10.5. * ext/readline/extconf.rb: checks existance of rl_catch_signals. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24176 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ ext/readline/extconf.rb | 1 + ext/readline/readline.c | 2 ++ 3 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2be1bce169..8cb5c5c4c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sat Jul 18 00:23:47 2009 Yuki Sonoda (Yugui) + + * ext/readline/readline.c (Init_readline): rl_catch_signals does + not exist on some platform like Mac OS X 10.5. + + * ext/readline/extconf.rb: checks existance of rl_catch_signals. + Fri Jul 17 22:37:22 2009 NAKAMURA Usaku * ext/socket/socket.c (socket_s_ip_address_list): drop inactive diff --git a/ext/readline/extconf.rb b/ext/readline/extconf.rb index bab6e3e726..14c2099b6d 100644 --- a/ext/readline/extconf.rb +++ b/ext/readline/extconf.rb @@ -66,6 +66,7 @@ have_readline_var("rl_point") # workaround for native windows. /mswin|bccwin|mingw/ !~ RUBY_PLATFORM && have_readline_var("rl_event_hook") /mswin|bccwin|mingw/ !~ RUBY_PLATFORM && have_readline_var("rl_catch_sigwinch") +/mswin|bccwin|mingw/ !~ RUBY_PLATFORM && have_readline_var("rl_catch_signals") have_readline_func("rl_cleanup_after_signal") have_readline_func("rl_clear_signals") have_readline_func("rl_set_screen_size") diff --git a/ext/readline/readline.c b/ext/readline/readline.c index 5f1c3553a8..20630d30ec 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -1451,7 +1451,9 @@ Init_readline() #elif defined HAVE_RL_EVENT_HOOK rl_event_hook = readline_event; #endif +#ifdef HAVE_RL_CATCH_SIGNALS rl_catch_signals = 0; +#endif #ifdef HAVE_RL_CATCH_SIGWINCH rl_catch_sigwinch = 0; #endif -- cgit v1.2.3