Skip to content

Instantly share code, notes, and snippets.

@benwah
Created June 25, 2014 15:25
Show Gist options
  • Save benwah/66dbc8516b223280254e to your computer and use it in GitHub Desktop.
Save benwah/66dbc8516b223280254e to your computer and use it in GitHub Desktop.
Patches ruby 2.0.0-p247 with support for readline 6.3 - based on https://gist.github.com/mislav/a18b9d7f0dc5b9efc162.txt
diff --git a/ext/readline/extconf.rb b/ext/readline/extconf.rb
index 4920137..012ae68 100644
--- a/ext/readline/extconf.rb
+++ b/ext/readline/extconf.rb
@@ -19,6 +19,10 @@ def readline.have_func(func)
return super(func, headers)
end
+def readline.have_type(type)
+ return super(type, headers)
+end
+
dir_config('curses')
dir_config('ncurses')
dir_config('termcap')
@@ -93,4 +97,7 @@ readline.have_func("remove_history")
readline.have_func("clear_history")
readline.have_func("rl_redisplay")
readline.have_func("rl_insert_text")
+unless readline.have_type("rl_hook_func_t")
+ $DEFS << "-Drl_hook_func_t=Function"
+end
create_makefile("readline")
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 3e7feea..482bf80 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -1883,7 +1883,7 @@ Init_readline()
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;
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment