3 files changed, 34 insertions, 30 deletions

diff --git a/gdb/tui/ChangeLog b/gdb/tui/ChangeLog
index e69b997..1e360ae 100644
--- a/gdb/tui/ChangeLog
+++ b/gdb/tui/ChangeLog
@@ -1,3 +1,11 @@
+2001-07-16  Stephane Carrez  <Stephane.Carrez@worldnet.fr>
+
+	* tui.h: Cleanup to avoid inclusion of curses includes.
+	(TuiGenWinInfo, TuiGenWinInfoPtr): Move from here.
+	* tuiData.h: To here; include curses includes here.
+	(setTermHeightTo): Rename of setTermHeight to follow reality.
+	(setTermWidthTo): Likewise with setTermWidth.
+
 2001-07-14  Stephane Carrez  <Stephane.Carrez@worldnet.fr>
 
 	* tuiWin.c, tui.c, tuiCommand.c: Use ansi prototype.
diff --git a/gdb/tui/tui.h b/gdb/tui/tui.h
index 07aa41a..8af18e9 100644
--- a/gdb/tui/tui.h
+++ b/gdb/tui/tui.h
@@ -21,18 +21,9 @@
 
 #ifndef TUI_H
 #define TUI_H
-#if defined (HAVE_NCURSES_H)
-#include <ncurses.h>
-#elif defined (HAVE_CURSES_H)
-#include <curses.h>
-#endif
 
-#ifdef ANSI_PROTOTYPES
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
+#include <string.h>
 #include "ansidecl.h"
 
 #if defined(reg)
@@ -97,23 +88,6 @@ TuiWinType, *TuiWinTypePtr;
        }
 TuiPoint, *TuiPointPtr;
 
-/* Generic window information */
-     typedef struct _TuiGenWinInfo
-       {
-	 WINDOW *handle;	/* window handle */
-	 TuiWinType type;	/* type of window */
-	 int width;		/* window width */
-	 int height;		/* window height */
-	 TuiPoint origin;	/* origin of window */
-	 OpaquePtr content;	/* content of window */
-	 int contentSize;	/* Size of content (# of elements) */
-	 int contentInUse;	/* Can it be used, or is it already used? */
-	 int viewportHeight;	/* viewport height */
-	 int lastVisibleLine;	/* index of last visible line */
-	 int isVisible;		/* whether the window is visible or not */
-       }
-TuiGenWinInfo, *TuiGenWinInfoPtr;
-
 /* GENERAL TUI FUNCTIONS */
 /* tui.c */
 extern void tuiInit (char *argv0);
diff --git a/gdb/tui/tuiData.h b/gdb/tui/tuiData.h
index 17293c2..033cdaa 100644
--- a/gdb/tui/tuiData.h
+++ b/gdb/tui/tuiData.h
@@ -22,6 +22,29 @@
 #ifndef TUI_DATA_H
 #define TUI_DATA_H
 
+#if defined (HAVE_NCURSES_H)
+#include <ncurses.h>
+#elif defined (HAVE_CURSES_H)
+#include <curses.h>
+#endif
+
+/* Generic window information */
+     typedef struct _TuiGenWinInfo
+       {
+	 WINDOW *handle;	/* window handle */
+	 TuiWinType type;	/* type of window */
+	 int width;		/* window width */
+	 int height;		/* window height */
+	 TuiPoint origin;	/* origin of window */
+	 OpaquePtr content;	/* content of window */
+	 int contentSize;	/* Size of content (# of elements) */
+	 int contentInUse;	/* Can it be used, or is it already used? */
+	 int viewportHeight;	/* viewport height */
+	 int lastVisibleLine;	/* index of last visible line */
+	 int isVisible;		/* whether the window is visible or not */
+       }
+TuiGenWinInfo, *TuiGenWinInfoPtr;
+
 /* Constant definitions */
 #define DEFAULT_TAB_LEN                8
 #define NO_SRC_STRING                  "[ No Source Available ]"
@@ -314,9 +337,9 @@ extern int winElementHeight (TuiGenWinInfoPtr, TuiWinElementPtr);
 extern TuiLayoutType currentLayout (void);
 extern void setCurrentLayoutTo (TuiLayoutType);
 extern int termHeight (void);
-extern void setTermHeight (int);
+extern void setTermHeightTo (int);
 extern int termWidth (void);
-extern void setTermWidth (int);
+extern void setTermWidthTo (int);
 extern int historyLimit (void);
 extern void setHistoryLimit (int);
 extern void setGenWinOrigin (TuiGenWinInfoPtr, int, int);
@@ -344,5 +367,4 @@ extern void tuiSetWinResizedTo (int);
 extern TuiWinInfoPtr tuiNextWin (TuiWinInfoPtr);
 extern TuiWinInfoPtr tuiPrevWin (TuiWinInfoPtr);
 
-
 #endif /* TUI_DATA_H */