Permalink
Browse files

remove duplicate patches, update #2678, update #2679

  • Loading branch information...
mpapis committed Mar 7, 2014
1 parent 16bbd60 commit 4bc20942069da1d9b09d50622ede7bde8f166c13
@@ -1,11 +0,0 @@
---- a/ext/readline/readline.c (revision 45224)
-+++ b/ext/readline/readline.c (revision 45225)
-@@ -1974,7 +1974,7 @@
-
- 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;
@@ -1,22 +0,0 @@
---- a/ext/readline/extconf.rb (revision 45239)
-+++ b/ext/readline/extconf.rb (revision 45240)
-@@ -19,6 +19,10 @@
- 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("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")

0 comments on commit 4bc2094

Please sign in to comment.