OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdb_curses.h: Undefine KEY_EVENT before including curses 

headers.  Move "#undef MOUSE_MOVED" before any curses header
 inclusion.
This commit is contained in:
Eli Zaretskii 2012-05-02 17:13:39 +00:00
parent 1c062060da
commit b31b86a798
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
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.

18
gdb/gdb_curses.h
View File

@ -20,13 +20,6 @@
#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
@ -34,7 +27,18 @@
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