nagachika	2014-05-01 20:59:37 +0900 (Thu, 01 May 2014)

  New Revision: 45773

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

  Log:
    merge revision(s) r45518: [Backport #9578] [Backport #9630] [Backport #9702]
    
    * ext/readline/extconf.rb (rl_hook_func_t): check pointer type.
      [ruby-dev:48089] [Bug #9702]

  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/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 45772)
+++ ruby_2_1/ChangeLog	(revision 45773)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Thu May  1 20:56:56 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/readline/extconf.rb (rl_hook_func_t): check pointer type.
+	  [ruby-dev:48089] [Bug #9702]
+
 Thu May  1 20:47:08 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/readline/extconf.rb: fix typo, `$defs` not `$DEFS`.
Index: ruby_2_1/ext/readline/extconf.rb
===================================================================
--- ruby_2_1/ext/readline/extconf.rb	(revision 45772)
+++ ruby_2_1/ext/readline/extconf.rb	(revision 45773)
@@ -98,7 +98,7 @@ 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")
+unless readline.have_type("rl_hook_func_t*")
   $defs << "-Drl_hook_func_t=Function"
 end
 
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 45772)
+++ ruby_2_1/version.h	(revision 45773)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-05-01"
-#define RUBY_PATCHLEVEL 81
+#define RUBY_PATCHLEVEL 82
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 5

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r45518


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