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.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 26 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index f313579979..87324c97e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Sat Jul 18 00:23:47 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* 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@ruby-lang.org>
+
+	* 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@ruby-lang.org>
 
 	* lib/foerwardable.rb: should be usable def_single_delegator for
diff --git a/ext/readline/extconf.rb b/ext/readline/extconf.rb
index 1d74e29124..d497612fa2 100644
--- a/ext/readline/extconf.rb
+++ b/ext/readline/extconf.rb
@@ -61,6 +61,8 @@ have_readline_var("rl_library_version")
 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")
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 124609cf57..90eaeec398 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -1305,6 +1305,12 @@ Init_readline()
 #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
diff --git a/version.h b/version.h
index 46fa8fc262..0178552961 100644
--- a/version.h
+++ b/version.h
@@ -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[];