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]


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

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index c308263420..cee32095ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May  1 20:56:56 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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@ruby-lang.org>
 
 	* ext/readline/extconf.rb: fix typo, `$defs` not `$DEFS`.
diff --git a/ext/readline/extconf.rb b/ext/readline/extconf.rb
index 0477a513c7..8c3bffc26e 100644
--- a/ext/readline/extconf.rb
+++ b/ext/readline/extconf.rb
@@ -98,7 +98,7 @@ readline.have_func("clear_history")
 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
 
diff --git a/version.h b/version.h
index 93f816fbee..b033e58c7a 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #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