[src/trunk]: src/gnu/dist/gdb/gdb Add casts so that we can compile with both ...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/90913869772f
branches:  trunk
changeset: 551975:90913869772f
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Sep 14 22:16:48 2003 +0000

description:
Add casts so that we can compile with both the readline headers and ours.
Of course we cannot link using our libedit yet.

diffstat:

 gnu/dist/gdb/gdb/top.c       |   6 ++++--
 gnu/dist/gdb/gdb/tui/tui.c   |  36 ++++++++++++++++++------------------
 gnu/dist/gdb/gdb/tui/tuiIO.c |   4 ++--
 3 files changed, 24 insertions(+), 22 deletions(-)

diffs (101 lines):

diff -r 8605c183a82d -r 90913869772f gnu/dist/gdb/gdb/top.c
--- a/gnu/dist/gdb/gdb/top.c    Sun Sep 14 22:15:23 2003 +0000
+++ b/gnu/dist/gdb/gdb/top.c    Sun Sep 14 22:16:48 2003 +0000
@@ -1952,7 +1952,8 @@
   write_history_p = 0;
 
   /* Setup important stuff for command line editing.  */
-  rl_completion_entry_function = (int (*)()) readline_line_completion_function;
+  rl_completion_entry_function =
+      (Function *)readline_line_completion_function;
   rl_completer_word_break_characters =
                                 get_gdb_completer_word_break_characters ();
   rl_completer_quote_characters = get_gdb_completer_quote_characters ();
@@ -1961,7 +1962,8 @@
 
   /* The name for this defun comes from Bash, where it originated.
      15 is Control-o, the same binding this function has in Bash.  */
-  rl_add_defun ("operate-and-get-next", gdb_rl_operate_and_get_next, 15);
+  rl_add_defun ("operate-and-get-next",
+      (Function *)gdb_rl_operate_and_get_next, 15);
 
   /* The set prompt command is different depending whether or not the
      async version is run. NOTE: this difference is going to
diff -r 8605c183a82d -r 90913869772f gnu/dist/gdb/gdb/tui/tui.c
--- a/gnu/dist/gdb/gdb/tui/tui.c        Sun Sep 14 22:15:23 2003 +0000
+++ b/gnu/dist/gdb/gdb/tui/tui.c        Sun Sep 14 22:16:48 2003 +0000
@@ -294,16 +294,16 @@
 
   rl_initialize ();
 
-  rl_add_defun ("tui-switch-mode", tui_rl_switch_mode, -1);
-  rl_add_defun ("gdb-command", tui_rl_command_key, -1);
-  rl_add_defun ("next-keymap", tui_rl_next_keymap, -1);
+  rl_add_defun ("tui-switch-mode", (Function *)tui_rl_switch_mode, -1);
+  rl_add_defun ("gdb-command", (Function *)tui_rl_command_key, -1);
+  rl_add_defun ("next-keymap", (Function *)tui_rl_next_keymap, -1);
 
   tui_keymap = rl_make_bare_keymap ();
   tui_ctlx_keymap = rl_make_bare_keymap ();
   tui_readline_standard_keymap = rl_get_keymap ();
 
   for (i = 0; tui_commands[i].cmd; i++)
-    rl_bind_key_in_map (tui_commands[i].key, tui_rl_command_key, tui_keymap);
+    rl_bind_key_in_map (tui_commands[i].key, (Function *)tui_rl_command_key, tui_keymap);
 
   rl_generic_bind (ISKMAP, "\\C-x", (char*) tui_ctlx_keymap, tui_keymap);
 
@@ -320,22 +320,22 @@
       if (tui_commands[j].cmd)
         continue;
 
-      rl_bind_key_in_map (i, tui_rl_command_mode, tui_keymap);
+      rl_bind_key_in_map (i, (Function *)tui_rl_command_mode, tui_keymap);
     }
 
-  rl_bind_key_in_map ('a', tui_rl_switch_mode, emacs_ctlx_keymap);
-  rl_bind_key_in_map ('a', tui_rl_switch_mode, tui_ctlx_keymap);
-  rl_bind_key_in_map ('A', tui_rl_switch_mode, emacs_ctlx_keymap);
-  rl_bind_key_in_map ('A', tui_rl_switch_mode, tui_ctlx_keymap);
-  rl_bind_key_in_map (CTRL ('A'), tui_rl_switch_mode, emacs_ctlx_keymap);
-  rl_bind_key_in_map (CTRL ('A'), tui_rl_switch_mode, tui_ctlx_keymap);
-  rl_bind_key_in_map ('1', tui_rl_delete_other_windows, emacs_ctlx_keymap);
-  rl_bind_key_in_map ('1', tui_rl_delete_other_windows, tui_ctlx_keymap);
-  rl_bind_key_in_map ('2', tui_rl_change_windows, emacs_ctlx_keymap);
-  rl_bind_key_in_map ('2', tui_rl_change_windows, tui_ctlx_keymap);
-  rl_bind_key_in_map ('q', tui_rl_next_keymap, tui_keymap);
-  rl_bind_key_in_map ('s', tui_rl_next_keymap, emacs_ctlx_keymap);
-  rl_bind_key_in_map ('s', tui_rl_next_keymap, tui_ctlx_keymap);
+  rl_bind_key_in_map ('a', (Function *)tui_rl_switch_mode, emacs_ctlx_keymap);
+  rl_bind_key_in_map ('a', (Function *)tui_rl_switch_mode, tui_ctlx_keymap);
+  rl_bind_key_in_map ('A', (Function *)tui_rl_switch_mode, emacs_ctlx_keymap);
+  rl_bind_key_in_map ('A', (Function *)tui_rl_switch_mode, tui_ctlx_keymap);
+  rl_bind_key_in_map (CTRL ('A'), (Function *)tui_rl_switch_mode, emacs_ctlx_keymap);
+  rl_bind_key_in_map (CTRL ('A'), (Function *)tui_rl_switch_mode, tui_ctlx_keymap);
+  rl_bind_key_in_map ('1', (Function *)tui_rl_delete_other_windows, emacs_ctlx_keymap);
+  rl_bind_key_in_map ('1', (Function *)tui_rl_delete_other_windows, tui_ctlx_keymap);
+  rl_bind_key_in_map ('2', (Function *)tui_rl_change_windows, emacs_ctlx_keymap);
+  rl_bind_key_in_map ('2', (Function *)tui_rl_change_windows, tui_ctlx_keymap);
+  rl_bind_key_in_map ('q', (Function *)tui_rl_next_keymap, tui_keymap);
+  rl_bind_key_in_map ('s', (Function *)tui_rl_next_keymap, emacs_ctlx_keymap);
+  rl_bind_key_in_map ('s', (Function *)tui_rl_next_keymap, tui_ctlx_keymap);
 }
 
 /* Enter in the tui mode (curses).
diff -r 8605c183a82d -r 90913869772f gnu/dist/gdb/gdb/tui/tuiIO.c
--- a/gnu/dist/gdb/gdb/tui/tuiIO.c      Sun Sep 14 22:15:23 2003 +0000
+++ b/gnu/dist/gdb/gdb/tui/tuiIO.c      Sun Sep 14 22:16:48 2003 +0000
@@ -507,11 +507,11 @@
       rl_redisplay_function = tui_redisplay_readline;
       rl_deprep_term_function = tui_deprep_terminal;
       rl_prep_term_function = tui_prep_terminal;
-      rl_getc_function = tui_getc;
+      rl_getc_function = (Function *)tui_getc;
       readline_echoing_p = 0;
       rl_outstream = tui_rl_outstream;
       rl_prompt = 0;
-      rl_completion_display_matches_hook = tui_rl_display_match_list;
+      rl_completion_display_matches_hook = (VFunction *)tui_rl_display_match_list;
       rl_already_prompted = 0;
 
       /* Keep track of previous gdb output.  */