nagachika	2014-03-03 01:33:36 +0900 (Mon, 03 Mar 2014)

  New Revision: 45252

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=45252

  Log:
    merge revision(s) r45225,r45240: [Backport #9578]
    
    * ext/readline/readline.c (Init_readline): Use rl_hook_func_t instead
      of Function to support readline-6.3.  (rl_hook_func_t is available
      since readline-4.2.)
      Reported by Dmitry Medvinsky.  [ruby-core:61141] [Bug #9578]
    
    * ext/readline/extconf.rb (rl_hook_func_t): define as Function for
      very old readline versions.  [ruby-core:61209] [Bug #9578]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/ext/readline/extconf.rb
    branches/ruby_2_0_0/ext/readline/readline.c
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 45251)
+++ ruby_2_0_0/ChangeLog	(revision 45252)
@@ -1,3 +1,15 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Mon Mar  3 01:32:14 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/readline/extconf.rb (rl_hook_func_t): define as Function for
+	  very old readline versions.  [ruby-core:61209] [Bug #9578]
+
+Mon Mar  3 01:32:14 2014  Tanaka Akira  <akr@f...>
+
+	* ext/readline/readline.c (Init_readline): Use rl_hook_func_t instead
+	  of Function to support readline-6.3.  (rl_hook_func_t is available
+	  since readline-4.2.)
+	  Reported by Dmitry Medvinsky.  [ruby-core:61141] [Bug #9578]
+
 Mon Mar  3 01:25:28 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* eval.c (setup_exception): preserve errinfo across calling #to_s
Index: ruby_2_0_0/ext/readline/readline.c
===================================================================
--- ruby_2_0_0/ext/readline/readline.c	(revision 45251)
+++ ruby_2_0_0/ext/readline/readline.c	(revision 45252)
@@ -1883,7 +1883,7 @@ Init_readline() https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/readline/readline.c#L1883
 
     rl_attempted_completion_function = readline_attempted_completion_function;
 #if defined(HAVE_RL_PRE_INPUT_HOOK)
-    rl_pre_input_hook = (Function *)readline_pre_input_hook;
+    rl_pre_input_hook = (rl_hook_func_t *)readline_pre_input_hook;
 #endif
 #ifdef HAVE_RL_CATCH_SIGNALS
     rl_catch_signals = 0;
Index: ruby_2_0_0/ext/readline/extconf.rb
===================================================================
--- ruby_2_0_0/ext/readline/extconf.rb	(revision 45251)
+++ ruby_2_0_0/ext/readline/extconf.rb	(revision 45252)
@@ -19,6 +19,10 @@ def readline.have_func(func) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/readline/extconf.rb#L19
   return super(func, headers)
 end
 
+def readline.have_type(type)
+  return super(type, headers)
+end
+
 dir_config('curses')
 dir_config('ncurses')
 dir_config('termcap')
@@ -93,4 +97,8 @@ readline.have_func("remove_history") https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/readline/extconf.rb#L97
 readline.have_func("clear_history")
 readline.have_func("rl_redisplay")
 readline.have_func("rl_insert_text")
+unless readline.have_type("rl_hook_func_t")
+  $DEFS << "-Drl_hook_func_t=Function"
+end
+
 create_makefile("readline")
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 45251)
+++ ruby_2_0_0/version.h	(revision 45252)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2014-03-03"
-#define RUBY_PATCHLEVEL 455
+#define RUBY_PATCHLEVEL 456
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r45225,45240


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/