Created
May 5, 2014 21:54
-
-
Save doxavore/8ea9cfbe25013510f962 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: orig/ext/readline/readline.c | |
=================================================================== | |
--- orig/ext/readline/readline.c (revision 45224) | |
+++ fixed/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; | |
Index: orig/ext/readline/extconf.rb | |
=================================================================== | |
--- orig/ext/readline/extconf.rb (revision 45239) | |
+++ fixed/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") | |
Index: orig/ext/readline/extconf.rb | |
=================================================================== | |
--- orig/ext/readline/extconf.rb (revision 45242) | |
+++ fixed/ext/readline/extconf.rb (revision 45243) | |
@@ -99,6 +99,9 @@ | |
readline.have_func("rl_insert_text") | |
readline.have_func("rl_delete_text") | |
unless readline.have_type("rl_hook_func_t") | |
+ # rl_hook_func_t is available since readline-4.2 (2001). | |
+ # Function is removed at readline-6.3 (2014). | |
+ # However, editline (NetBSD 6.1.3, 2014) doesn't have rl_hook_func_t. | |
$DEFS << "-Drl_hook_func_t=Function" | |
end |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment