nagachika	2014-05-01 20:55:03 +0900 (Thu, 01 May 2014)

  New Revision: 45772

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

  Log:
    merge revision(s) r45225,r45240,r45488: [Backport #9578] [Backport #9630]
    
    * 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]
    
    * ext/readline/extconf.rb: fix typo, `$defs` not `$DEFS`.
      [ruby-core:61756] [Bug #9578]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/ext/readline/extconf.rb
    branches/ruby_2_1/ext/readline/readline.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 45771)
+++ ruby_2_1/ChangeLog	(revision 45772)
@@ -1,3 +1,20 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Thu May  1 20:47:08 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/readline/extconf.rb: fix typo, `$defs` not `$DEFS`.
+	  [ruby-core:61756] [Bug #9578]
+
+Thu May  1 20:47:08 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]
+
+Thu May  1 20:47:08 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]
+
 Sat Mar  1 21:00:27 2014  Marc-Andre Lafortune  <ruby-core@m...>
 
 	* proc.c: Having optional keyword arguments makes maximum arity +1,
Index: ruby_2_1/ext/readline/readline.c
===================================================================
--- ruby_2_1/ext/readline/readline.c	(revision 45771)
+++ ruby_2_1/ext/readline/readline.c	(revision 45772)
@@ -1974,7 +1974,7 @@ Init_readline() https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/readline/readline.c#L1974
 
     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_1/ext/readline/extconf.rb
===================================================================
--- ruby_2_1/ext/readline/extconf.rb	(revision 45771)
+++ ruby_2_1/ext/readline/extconf.rb	(revision 45772)
@@ -19,6 +19,10 @@ def readline.have_func(func) https://github.com/ruby/ruby/blob/trunk/ruby_2_1/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')
@@ -94,4 +98,8 @@ readline.have_func("clear_history") https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/readline/extconf.rb#L98
 readline.have_func("rl_redisplay")
 readline.have_func("rl_insert_text")
 readline.have_func("rl_delete_text")
+unless readline.have_type("rl_hook_func_t")
+  $defs << "-Drl_hook_func_t=Function"
+end
+
 create_makefile("readline")
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 45771)
+++ ruby_2_1/version.h	(revision 45772)
@@ -1,9 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
-#define RUBY_RELEASE_DATE "2014-03-01"
-#define RUBY_PATCHLEVEL 80
+#define RUBY_RELEASE_DATE "2014-05-01"
+#define RUBY_PATCHLEVEL 81
 
 #define RUBY_RELEASE_YEAR 2014
-#define RUBY_RELEASE_MONTH 3
+#define RUBY_RELEASE_MONTH 5
 #define RUBY_RELEASE_DAY 1
 
 #include "ruby/version.h"

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


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