gdb/

[deliverable/binutils-gdb.git] / gdb / gdb_curses.h

diff --git a/gdb/gdb_curses.h b/gdb/gdb_curses.h
index 7d8d09a184c6d41d070e9bc379f8856b92f802d0..242d6e7d7c5f085cc95e61d1580dd4bd22f146ce 100644 (file)
--- a/gdb/gdb_curses.h
+++ b/gdb/gdb_curses.h
@@ -1,7 +1,6 @@
 /* Portable <curses.h>.
 
-   Copyright (C) 2004, 2006, 2007, 2008, 2009, 2010
-   Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -21,6 +20,18 @@
 #ifndef GDB_CURSES_H
 #define GDB_CURSES_H 1
 
+#ifdef __MINGW32__
+/* Windows API headers, included e.g. by serial.h, define MOUSE_MOVED,
+   and so does PDCurses's curses.h, but for an entirely different
+   purpose.  Since we don't use the Windows semantics of MOUSE_MOVED
+   anywhere, avoid compiler warnings by undefining MOUSE_MOVED before
+   including curses.h.  */
+#undef MOUSE_MOVED
+/* Likewise, KEY_EVENT is defined by ncurses.h, but also by Windows
+   API headers.  */
+#undef KEY_EVENT
+#endif
+
 #if defined (HAVE_NCURSES_NCURSES_H)
 #include <ncurses/ncurses.h>
 #elif defined (HAVE_NCURSES_H)