usa	2014-04-30 16:39:45 +0900 (Wed, 30 Apr 2014)

  New Revision: 45754

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

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

  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/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 45753)
+++ ruby_2_0_0/ChangeLog	(revision 45754)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Wed Apr 30 16:39:43 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/readline/extconf.rb (rl_hook_func_t): check pointer type.
+	  [ruby-dev:48089] [Bug #9702]
+
 Wed Apr 30 16:37:16 2014  NAKAMURA Usaku  <usa@r...>
 
 	* win32/win32.c (rb_w32_accept, open_ifs_socket, socketpair_internal):
Index: ruby_2_0_0/ext/readline/extconf.rb
===================================================================
--- ruby_2_0_0/ext/readline/extconf.rb	(revision 45753)
+++ ruby_2_0_0/ext/readline/extconf.rb	(revision 45754)
@@ -97,7 +97,7 @@ 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")
+unless readline.have_type("rl_hook_func_t*")
   $defs << "-Drl_hook_func_t=Function"
 end
 
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 45753)
+++ ruby_2_0_0/version.h	(revision 45754)
@@ -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-04-30"
-#define RUBY_PATCHLEVEL 474
+#define RUBY_PATCHLEVEL 475
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 4

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


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