ruby-changes:12577
From: yugui <ko1@a...>
Date: Mon, 27 Jul 2009 00:22:06 +0900 (JST)
Subject: [ruby-changes:12577] Ruby:r24285 (ruby_1_9_1): merges r24171 and r24176 from trunk into ruby_1_9_1.
yugui 2009-07-27 00:21:44 +0900 (Mon, 27 Jul 2009) New Revision: 24285 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24285 Log: merges r24171 and r24176 from trunk into ruby_1_9_1. -- * ext/readline/readline.c (Init_readline): use rl_catch_sigwinch only when existing. * ext/readline/extconf.rb: check existance of rl_catch_sigwinch, and workaround for native Win32 readline port. -- * 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. Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/ext/readline/extconf.rb branches/ruby_1_9_1/ext/readline/readline.c branches/ruby_1_9_1/version.h Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 24284) +++ ruby_1_9_1/ChangeLog (revision 24285) @@ -1,3 +1,18 @@ +Sat Jul 18 00:23:47 2009 Yuki Sonoda (Yugui) <yugui@y...> + + * 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:29:21 2009 NAKAMURA Usaku <usa@r...> + + * ext/readline/readline.c (Init_readline): use rl_catch_sigwinch only + when existing. + + * ext/readline/extconf.rb: check existance of rl_catch_sigwinch, and + workaround for native Win32 readline port. + Fri Nov 28 17:52:26 2008 Keiju Ishitsuka <keiju@r...> * lib/foerwardable.rb: should be usable def_single_delegator for Index: ruby_1_9_1/ext/readline/readline.c =================================================================== --- ruby_1_9_1/ext/readline/readline.c (revision 24284) +++ ruby_1_9_1/ext/readline/readline.c (revision 24285) @@ -1305,6 +1305,12 @@ #ifdef 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 #ifdef HAVE_RL_CLEAR_SIGNALS rl_clear_signals(); #endif Index: ruby_1_9_1/ext/readline/extconf.rb =================================================================== --- ruby_1_9_1/ext/readline/extconf.rb (revision 24284) +++ ruby_1_9_1/ext/readline/extconf.rb (revision 24285) @@ -61,6 +61,8 @@ have_readline_var("rl_editing_mode") # 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_vi_editing_mode") Index: ruby_1_9_1/version.h =================================================================== --- ruby_1_9_1/version.h (revision 24284) +++ ruby_1_9_1/version.h (revision 24285) @@ -1,12 +1,12 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_RELEASE_DATE "2009-07-16" -#define RUBY_PATCHLEVEL 243 +#define RUBY_RELEASE_DATE "2009-07-26" +#define RUBY_PATCHLEVEL 244 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 7 -#define RUBY_RELEASE_DAY 12 +#define RUBY_RELEASE_DAY 26 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/