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

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

2014-05-26  Holger Hans Peter Freyther  <[hidden email]>

        * 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  <[hidden email]>
+
+ * 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  <[hidden email]>
 
  * 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


_______________________________________________
help-smalltalk mailing list
[hidden email]
https://lists.gnu.org/mailman/listinfo/help-smalltalk

Use Tcl_GetStringResult(interp) instead of interp->result on
newer versions of Tcl. It looks like Tcl_GetStringResult has
been present in the entire 8.0 series.

2014-05-26  Holger Hans Peter Freyther  <[hidden email]>

        * BloxTK.c: Use Tcl_GetStringResult to access the result.
---
 packages/blox/tk/BloxTK.c  | 4 ++--
 packages/blox/tk/ChangeLog | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/blox/tk/BloxTK.c b/packages/blox/tk/BloxTK.c
index 2ba40b8..2f06b7f 100644
--- a/packages/blox/tk/BloxTK.c
+++ b/packages/blox/tk/BloxTK.c
@@ -173,12 +173,12 @@ tclInit (void)
 
   if (Tcl_Init (interp) == TCL_ERROR)
     {
-      fprintf (stderr, "Tcl_Init failed: %s\n", interp->result);
+      fprintf (stderr, "Tcl_Init failed: %s\n",  Tcl_GetStringResult(interp));
       exit (1);
     }
   if (Tk_Init (interp) == TCL_ERROR)
     {
-      fprintf (stderr, "Tk_Init failed: %s\n", interp->result);
+      fprintf (stderr, "Tk_Init failed: %s\n", Tcl_GetStringResult(interp));
       exit (1);
     }
   Tcl_CreateCommand (interp, "callback", doCallback, NULL, NULL);
diff --git a/packages/blox/tk/ChangeLog b/packages/blox/tk/ChangeLog
index aefd2dc..159b177 100644
--- a/packages/blox/tk/ChangeLog
+++ b/packages/blox/tk/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-26  Holger Hans Peter Freyther  <[hidden email]>
+
+ * BloxTK.c: Use Tcl_GetStringResult to access the result.
+
 2010-12-04  Paolo Bonzini  <[hidden email]>
 
  * package.xml: Remove now superfluous <file> tags.
--
1.9.1


_______________________________________________
help-smalltalk mailing list
[hidden email]
https://lists.gnu.org/mailman/listinfo/help-smalltalk