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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6ec89e9e7d3c2af5d57c24fc1e39a07b732d5593..0f82fe7054d3911a3d7523a0dc8e39e9ef78eb4d 100644 (file)
--- 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 a7f24d3f5d40af11437f572176035c765da5fb2d..38cfc5721839ed21467667a944fee93b8b0100b0 100644 (file)
--- 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 930ae266dea3c42de35c7628fde319c1680c7524..18d706fe250e720214f79f1a685590a00daf74f0 100644 (file)
--- 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 0f5a66d8cc1003007ecbe700218388749d323c5b..fd868e25a402eb5ef16888c54640a4fe0080a845 100644 (file)
--- 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 5194eff227c3ed9fe34d4d07fa67f911d4fda51f..256f694e87020971b59fee95d013e112d99bf619 100644 (file)
--- 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 b67aeac66cd79d83c7464f528036750ad91c8de9..cb670ed7a26b11dbd153b9fcfdcb89e2d544ff97 100644 (file)
--- 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 f7c3c6bc8a29351ee0b2f95ef456ce9e85773af7..2cab1be5e84f56e052988a9517894e1685eb26c9 100644 (file)
--- 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 8ec54fe62c3b461cd54fb14059a59f7447b3cd50..b6d84e46d91157c8f62e4e292c1b0250c2162bb5 100644 (file)
--- 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 ad8a53a69c64563c7952cc715ece1501f9b7fe32..31e7c23ad2be9cc2a3ba916dac601b72ba6d8071 100644 (file)
--- 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 3626e52599d6fde43b703bdec6e129bb2b39f0cc..061317855f33cb99441ebc84df0c9d8b4914b9b8 100644 (file)
--- 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 f93d2b912cc1938445c1735d0127812733a98abc..dc684fd21372a03a7c5a782ec0373ea1f1e25346 100644 (file)
--- 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 5dc5adec7e61e7e050aeafffab14d342b7bdbe38..3ad71bcc88bd5699638f05ca36807ba123a00c6c 100644 (file)
--- 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 388ec3e774693d3fb6db24383653a8eabeb5e3b3..3deac193d9749c2995c8c1dc5fd52f5ff47570c8 100644 (file)
--- 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 501252c850eef5363578d9b066613e1d6e244164..9b664ed8a3e55c0310ab372973527fe0dc86e9f1 100644 (file)
--- 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 3611a089603ca2884407a7f49475a5748501a962..b5b6d6d076d16291c49180ea16de57f2be26df3e 100644 (file)
--- 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 34b660d9a87e08006dd051691b6969edebd32102..db21d34abed0025ff5f9d7121eb0e479cc7ce987 100644 (file)
--- 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