[Help-smalltalk] [PATCH 1/2] readline: CPPFunction was removed in version 6.3-5 of readline

[Holger Hans Peter Freyther]

CPPFunction was deprecated in readling-4.2. Stop using the old
symbol and update the autoconf test.

2014-05-26  Holger Hans Peter Freyther  <address@hidden>

        * input.c: Use rl_quote_func_t, rl_dequote_func_t and
        rl_completion_func_t instead of the deprecated CPPFunction
---
 build-aux/readline.m4 | 2 +-
 libgst/ChangeLog      | 5 +++++
 libgst/input.c        | 6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/build-aux/readline.m4 b/build-aux/readline.m4
index 2f5e433..5031062 100644
--- a/build-aux/readline.m4
+++ b/build-aux/readline.m4
@@ -31,7 +31,7 @@ main()
 {
   rl_bind_key ('\t', rl_insert);
   /* This is missing in BSD libedit!  */
-  rl_filename_quoting_function = (CPFunction *) readline_quote_filename;
+  rl_filename_quoting_function = (rl_quote_func_t *) readline_quote_filename;
   exit(0);
 }
 EOF
diff --git a/libgst/ChangeLog b/libgst/ChangeLog
index 471c565..f294313 100644
--- a/libgst/ChangeLog
+++ b/libgst/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-26  Holger Hans Peter Freyther  <address@hidden>
+
+       * input.c: Use rl_quote_func_t, rl_dequote_func_t and
+       rl_completion_func_t instead of the deprecated CPPFunction
+
 2014-04-16  In-Ho Yi  <address@hidden>
 
        * sysdep/cygwin/findexec.c: Update comment and change
diff --git a/libgst/input.c b/libgst/input.c
index 9872a50..a2e98eb 100644
--- a/libgst/input.c
+++ b/libgst/input.c
@@ -1150,13 +1150,13 @@ _gst_initialize_readline (void)
   rl_special_prefixes = (char *) "+-=*<>~?%/@|&\\";
 
   /* Our rules for quoting are a bit different from the default */
-  rl_filename_quoting_function = (CPFunction *) readline_quote_filename;
+  rl_filename_quoting_function = (rl_quote_func_t *) readline_quote_filename;
   rl_filename_dequoting_function =
-    (CPFunction *) readline_dequote_filename;
+    (rl_dequote_func_t *) readline_dequote_filename;
 
   /* Try to match a symbol before a filename */
   rl_attempted_completion_function =
-    (CPPFunction *) readline_match_symbols;
+    (rl_completion_func_t *) readline_match_symbols;
 
   /* Since we have to sort the array to perform the binary search,
      remove duplicates and avoid that readline resorts the result.  */
-- 
1.9.1