+2012-05-02 Eli Zaretskii <eliz@gnu.org>
+
+ * gdb_curses.h: Undefine KEY_EVENT before including curses
+ headers. Move "#undef MOUSE_MOVED" before any curses header
+ inclusion.
+
2012-05-02 Sergio Durigan Junior <sergiodj@gmail.com>
* features/i386/i386-mmx-linux.c: Regenerate.
#ifndef GDB_CURSES_H
#define GDB_CURSES_H 1
-#if defined (HAVE_NCURSES_NCURSES_H)
-#include <ncurses/ncurses.h>
-#elif defined (HAVE_NCURSES_H)
-#include <ncurses.h>
-#elif defined (HAVE_CURSESX_H)
-#include <cursesX.h>
-#elif defined (HAVE_CURSES_H)
#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
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)
+#include <ncurses.h>
+#elif defined (HAVE_CURSESX_H)
+#include <cursesX.h>
+#elif defined (HAVE_CURSES_H)
#include <curses.h>
#endif