diff options
| author | Morgan Deters <mdeters@gmail.com> | 2012-11-27 19:18:12 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2012-11-27 19:18:12 +0000 |
| commit | 49da3204bbb10fbcd87923428f3b476ba5b57af6 (patch) | |
| tree | 9408afc6a466f799453de0399e8363d081f37483 | |
| parent | a1fa0d6a3d185c3f9089542893295ea001734289 (diff) | |
more mac fixes
| -rw-r--r-- | config/readline.m4 | 5 | ||||
| -rw-r--r-- | src/main/interactive_shell.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/config/readline.m4 b/config/readline.m4 index dcf9a9c18..44be9ff41 100644 --- a/config/readline.m4 +++ b/config/readline.m4 @@ -62,12 +62,13 @@ else AC_MSG_CHECKING([for type of rl_completion_entry_function]) AC_LANG_PUSH([C++]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ +#include <stdio.h> #include <readline/readline.h> char* foo(const char*, int) { return (char*)0; }],[ -::rl_completion_entry_function = foo;])], +rl_completion_entry_function = foo;])], [AC_MSG_RESULT([char* (*)(const char*, int)]) readline_compentry_func_returns_charp=1], - [AC_MSG_FAILURE([Function])]) + [AC_MSG_RESULT([Function])]) AC_LANG_POP([C++]) else have_libreadline=0 diff --git a/src/main/interactive_shell.cpp b/src/main/interactive_shell.cpp index 7cef623e9..c1d2c2bb1 100644 --- a/src/main/interactive_shell.cpp +++ b/src/main/interactive_shell.cpp @@ -98,7 +98,7 @@ InteractiveShell::InteractiveShell(ExprManager& exprManager, #if READLINE_COMPENTRY_FUNC_RETURNS_CHARP ::rl_completion_entry_function = commandGenerator; #else /* READLINE_COMPENTRY_FUNC_RETURNS_CHARP */ - ::rl_completion_entry_function = (Function) commandGenerator; + ::rl_completion_entry_function = (int (*)(const char*, int)) commandGenerator; #endif /* READLINE_COMPENTRY_FUNC_RETURNS_CHARP */ ::using_history(); |