summaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog8
-rw-r--r--gdb/cli/cli-cmds.c1
-rw-r--r--gdb/cli/cli-setshow.c1
-rw-r--r--gdb/defs.h4
-rw-r--r--gdb/tui/ChangeLog8
-rw-r--r--gdb/tui/tuiWin.c7
6 files changed, 23 insertions, 6 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 95b6642961c..d9ea83942ec 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,13 @@
2002-12-08 Elena Zannoni <ezannoni@redhat.com>
+ Import of readline 4.3:
+ * cli/cli-cmds.c: Include readline/tilde.h.
+ * cli/cli-setshow.c: Ditto.
+ * defs.h: Don't declare tilde_expand anymore, since readline
+ exports it.
+
+2002-12-08 Elena Zannoni <ezannoni@redhat.com>
+
* Makefile.in (thread-db.o): Add explicit rule to ignore the use of
-Werror on this file.
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 97c666ffd38..fd008183ec2 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -19,6 +19,7 @@
Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#include <readline/tilde.h>
#include "defs.h"
#include "completer.h"
#include "target.h" /* For baud_rate, remote_debug and remote_timeout */
diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c
index 44b0b4ec460..efd334f25e4 100644
--- a/gdb/cli/cli-setshow.c
+++ b/gdb/cli/cli-setshow.c
@@ -17,6 +17,7 @@
Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#include <readline/tilde.h>
#include "defs.h"
#include "value.h"
#include <ctype.h>
diff --git a/gdb/defs.h b/gdb/defs.h
index 48eb509ebe6..3ac3d9a5d60 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -614,10 +614,6 @@ enum lval_type
struct frame_info;
-/* From readline (but not in any readline .h files). */
-
-extern char *tilde_expand (char *);
-
/* Control types for commands */
enum misc_command_type
diff --git a/gdb/tui/ChangeLog b/gdb/tui/ChangeLog
index 95ab72e8eb4..88ad5e7ea60 100644
--- a/gdb/tui/ChangeLog
+++ b/gdb/tui/ChangeLog
@@ -1,3 +1,11 @@
+2002-12-08 Elena Zannoni <ezannoni@redhat.com>
+
+ Import of readline 4.3.
+ Fix PR gdb/675
+ * tuiWin.c: Include readline/readline.h.
+ (tui_update_gdb_sizes): Use accessor function rl_get_screen_size.
+ (tuiResizeAll): Ditto.
+
2002-12-06 Elena Zannoni <ezannoni@redhat.com>
* tuiStack.c (tuiShowFrameInfo): Fix typo.
diff --git a/gdb/tui/tuiWin.c b/gdb/tui/tuiWin.c
index b82ce2f153d..9ad82f57a65 100644
--- a/gdb/tui/tuiWin.c
+++ b/gdb/tui/tuiWin.c
@@ -46,6 +46,7 @@
#include <string.h>
#include <ctype.h>
+#include <readline/readline.h>
#include "defs.h"
#include "command.h"
#include "symtab.h"
@@ -417,8 +418,9 @@ void
tui_update_gdb_sizes ()
{
char cmd[50];
- extern int screenheight, screenwidth; /* in readline */
+ int screenheight, screenwidth;
+ rl_get_screen_size (&screenheight, &screenwidth);
/* Set to TUI command window dimension or use readline values. */
sprintf (cmd, "set width %d",
tui_active ? cmdWin->generic.width : screenwidth);
@@ -634,8 +636,9 @@ void
tuiResizeAll (void)
{
int heightDiff, widthDiff;
- extern int screenheight, screenwidth; /* in readline */
+ int screenheight, screenwidth;
+ rl_get_screen_size (&screenheight, &screenwidth);
widthDiff = screenwidth - termWidth ();
heightDiff = screenheight - termHeight ();
if (heightDiff || widthDiff)