2002-02-08 Daniel Jacobowitz <drow@mvista.com>

        * utils.c: Include <curses.h> before "bfd.h".
        * tui/tui-hooks.c: Likewise.
        * tui/tui.c: Likewise.
        * tui/tuiCommand.c: Likewise.
        * tui/tuiData.c: Likewise.
        * tui/tuiDataWin.c: Likewise.
        * tui/tuiDisassem.c: Likewise.
        * tui/tuiGeneralWin.c: Likewise.
        * tui/tuiIO.c: Likewise.
        * tui/tuiLayout.c: Likewise.
        * tui/tuiRegs.c: Likewise.
        * tui/tuiSource.c: Likewise.
        * tui/tuiSourceWin.c: Likewise.
        * tui/tuiStack.c: Likewise.
        * tui/tuiWin.c: Likewise.

16 files changed, 167 insertions, 5 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6ec89e9e7d3..0f82fe7054d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,21 @@
+2002-02-08  Daniel Jacobowitz  <drow@mvista.com>
+
+	* utils.c: Include <curses.h> before "bfd.h".
+	* tui/tui-hooks.c: Likewise.
+	* tui/tui.c: Likewise.
+	* tui/tuiCommand.c: Likewise.
+	* tui/tuiData.c: Likewise.
+	* tui/tuiDataWin.c: Likewise.
+	* tui/tuiDisassem.c: Likewise.
+	* tui/tuiGeneralWin.c: Likewise.
+	* tui/tuiIO.c: Likewise.
+	* tui/tuiLayout.c: Likewise.
+	* tui/tuiRegs.c: Likewise.
+	* tui/tuiSource.c: Likewise.
+	* tui/tuiSourceWin.c: Likewise.
+	* tui/tuiStack.c: Likewise.
+	* tui/tuiWin.c: Likewise.
+
 2002-02-07  Elena Zannoni  <ezannoni@redhat.com>
 
 	* sh-tdep.c (sh_nofp_frame_init_saved_regs): Extend where[] array
diff --git a/gdb/tui/tui-hooks.c b/gdb/tui/tui-hooks.c
index a7f24d3f5d4..38cfc572183 100644
--- a/gdb/tui/tui-hooks.c
+++ b/gdb/tui/tui-hooks.c
@@ -18,6 +18,16 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+/* If we need <curses.h>, we must include it before we get "bfd.h".  */
+#include "config.h"
+#ifdef HAVE_NCURSES_H
+#include <ncurses.h>
+#else
+#ifdef HAVE_CURSES_H
+#include <curses.h>
+#endif
+#endif
+
 #include "defs.h"
 #include "symtab.h"
 #include "inferior.h"
diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c
index 930ae266dea..18d706fe250 100644
--- a/gdb/tui/tui.c
+++ b/gdb/tui/tui.c
@@ -19,6 +19,16 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+/* If we need <curses.h>, we must include it before we get "bfd.h".  */
+#include "config.h"
+#ifdef HAVE_NCURSES_H       
+#include <ncurses.h>
+#else
+#ifdef HAVE_CURSES_H
+#include <curses.h>
+#endif
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/gdb/tui/tuiCommand.c b/gdb/tui/tuiCommand.c
index 0f5a66d8cc1..fd868e25a40 100644
--- a/gdb/tui/tuiCommand.c
+++ b/gdb/tui/tuiCommand.c
@@ -19,6 +19,16 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+/* If we need <curses.h>, we must include it before we get "bfd.h".  */
+#include "config.h"
+#ifdef HAVE_NCURSES_H       
+#include <ncurses.h>
+#else
+#ifdef HAVE_CURSES_H
+#include <curses.h>
+#endif
+#endif
+
 #include "defs.h"
 #include <ctype.h>
 #include "tui.h"
diff --git a/gdb/tui/tuiData.c b/gdb/tui/tuiData.c
index 5194eff227c..256f694e870 100644
--- a/gdb/tui/tuiData.c
+++ b/gdb/tui/tuiData.c
@@ -19,6 +19,16 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+/* If we need <curses.h>, we must include it before we get "bfd.h".  */
+#include "config.h"
+#ifdef HAVE_NCURSES_H       
+#include <ncurses.h>
+#else
+#ifdef HAVE_CURSES_H
+#include <curses.h>
+#endif
+#endif
+
 #include "defs.h"
 #include "tui.h"
 #include "tuiData.h"
diff --git a/gdb/tui/tuiDataWin.c b/gdb/tui/tuiDataWin.c
index b67aeac66cd..cb670ed7a26 100644
--- a/gdb/tui/tuiDataWin.c
+++ b/gdb/tui/tuiDataWin.c
@@ -19,6 +19,16 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+/* If we need <curses.h>, we must include it before we get "bfd.h".  */
+#include "config.h"
+#ifdef HAVE_NCURSES_H       
+#include <ncurses.h>
+#else
+#ifdef HAVE_CURSES_H
+#include <curses.h>
+#endif
+#endif
+
 #include "defs.h"
 #include "tui.h"
 #include "tuiData.h"
diff --git a/gdb/tui/tuiDisassem.c b/gdb/tui/tuiDisassem.c
index f7c3c6bc8a2..2cab1be5e84 100644
--- a/gdb/tui/tuiDisassem.c
+++ b/gdb/tui/tuiDisassem.c
@@ -19,6 +19,16 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+/* If we need <curses.h>, we must include it before we get "bfd.h".  */
+#include "config.h"
+#ifdef HAVE_NCURSES_H       
+#include <ncurses.h>
+#else
+#ifdef HAVE_CURSES_H
+#include <curses.h>
+#endif
+#endif
+
 #include "defs.h"
 #include "symtab.h"
 #include "breakpoint.h"
diff --git a/gdb/tui/tuiGeneralWin.c b/gdb/tui/tuiGeneralWin.c
index 8ec54fe62c3..b6d84e46d91 100644
--- a/gdb/tui/tuiGeneralWin.c
+++ b/gdb/tui/tuiGeneralWin.c
@@ -19,6 +19,16 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+/* If we need <curses.h>, we must include it before we get "bfd.h".  */
+#include "config.h"
+#ifdef HAVE_NCURSES_H       
+#include <ncurses.h>
+#else
+#ifdef HAVE_CURSES_H
+#include <curses.h>
+#endif
+#endif
+
 #include "defs.h"
 #include "tui.h"
 #include "tuiData.h"
diff --git a/gdb/tui/tuiIO.c b/gdb/tui/tuiIO.c
index ad8a53a69c6..31e7c23ad2b 100644
--- a/gdb/tui/tuiIO.c
+++ b/gdb/tui/tuiIO.c
@@ -19,6 +19,16 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+/* If we need <curses.h>, we must include it before we get "bfd.h".  */
+#include "config.h"
+#ifdef HAVE_NCURSES_H       
+#include <ncurses.h>
+#else
+#ifdef HAVE_CURSES_H
+#include <curses.h>
+#endif
+#endif
+
 #include <stdio.h>
 #include "defs.h"
 #include "terminal.h"
diff --git a/gdb/tui/tuiLayout.c b/gdb/tui/tuiLayout.c
index 3626e52599d..061317855f3 100644
--- a/gdb/tui/tuiLayout.c
+++ b/gdb/tui/tuiLayout.c
@@ -19,6 +19,16 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+/* If we need <curses.h>, we must include it before we get "bfd.h".  */
+#include "config.h"
+#ifdef HAVE_NCURSES_H       
+#include <ncurses.h>
+#else
+#ifdef HAVE_CURSES_H
+#include <curses.h>
+#endif
+#endif
+
 #include "defs.h"
 #include "command.h"
 #include "symtab.h"
diff --git a/gdb/tui/tuiRegs.c b/gdb/tui/tuiRegs.c
index f93d2b912cc..dc684fd2137 100644
--- a/gdb/tui/tuiRegs.c
+++ b/gdb/tui/tuiRegs.c
@@ -19,6 +19,16 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+/* If we need <curses.h>, we must include it before we get "bfd.h".  */
+#include "config.h"
+#ifdef HAVE_NCURSES_H       
+#include <ncurses.h>
+#else
+#ifdef HAVE_CURSES_H
+#include <curses.h>
+#endif
+#endif
+
 #include "defs.h"
 #include "tui.h"
 #include "tuiData.h"
diff --git a/gdb/tui/tuiSource.c b/gdb/tui/tuiSource.c
index 5dc5adec7e6..3ad71bcc88b 100644
--- a/gdb/tui/tuiSource.c
+++ b/gdb/tui/tuiSource.c
@@ -19,6 +19,16 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+/* If we need <curses.h>, we must include it before we get "bfd.h".  */
+#include "config.h"
+#ifdef HAVE_NCURSES_H       
+#include <ncurses.h>
+#else
+#ifdef HAVE_CURSES_H
+#include <curses.h>
+#endif
+#endif
+
 #include "defs.h"
 #include <ctype.h>
 #include "symtab.h"
diff --git a/gdb/tui/tuiSourceWin.c b/gdb/tui/tuiSourceWin.c
index 388ec3e7746..3deac193d97 100644
--- a/gdb/tui/tuiSourceWin.c
+++ b/gdb/tui/tuiSourceWin.c
@@ -19,6 +19,16 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+/* If we need <curses.h>, we must include it before we get "bfd.h".  */
+#include "config.h"
+#ifdef HAVE_NCURSES_H       
+#include <ncurses.h>
+#else
+#ifdef HAVE_CURSES_H
+#include <curses.h>
+#endif
+#endif
+
 #include "defs.h"
 #include <ctype.h>
 #include "symtab.h"
diff --git a/gdb/tui/tuiStack.c b/gdb/tui/tuiStack.c
index 501252c850e..9b664ed8a3e 100644
--- a/gdb/tui/tuiStack.c
+++ b/gdb/tui/tuiStack.c
@@ -19,6 +19,16 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+/* If we need <curses.h>, we must include it before we get "bfd.h".  */
+#include "config.h"
+#ifdef HAVE_NCURSES_H       
+#include <ncurses.h>
+#else
+#ifdef HAVE_CURSES_H
+#include <curses.h>
+#endif
+#endif
+
 #include "defs.h"
 #include "symtab.h"
 #include "breakpoint.h"
diff --git a/gdb/tui/tuiWin.c b/gdb/tui/tuiWin.c
index 3611a089603..b5b6d6d076d 100644
--- a/gdb/tui/tuiWin.c
+++ b/gdb/tui/tuiWin.c
@@ -24,6 +24,16 @@
 
    Author: Susan B. Macchia  */
 
+/* If we need <curses.h>, we must include it before we get "bfd.h".  */
+#include "config.h"
+#ifdef HAVE_NCURSES_H       
+#include <ncurses.h>
+#else
+#ifdef HAVE_CURSES_H
+#include <curses.h>
+#endif
+#endif
+
 #include <string.h>
 #include <ctype.h>
 #include "defs.h"
diff --git a/gdb/utils.c b/gdb/utils.c
index 34b660d9a87..db21d34abed 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -20,12 +20,10 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include "defs.h"
-#include "gdb_assert.h"
-#include <ctype.h>
-#include "gdb_string.h"
-#include "event-top.h"
+#include "config.h"
 
+/* Include before "bfd.h" so that we get stdbool.h in time, if <curses.h>
+   brings it in.  */
 #ifdef HAVE_CURSES_H
 #include <curses.h>
 #endif
@@ -33,6 +31,12 @@
 #include <term.h>
 #endif
 
+#include "defs.h"
+#include "gdb_assert.h"
+#include <ctype.h>
+#include "gdb_string.h"
+#include "event-top.h"
+
 #ifdef __GO32__
 #include <pc.h>
 #endif