Austin English : wineconsole: Only use getmouse when HAVE_MOUSEMASK is defined.
Alexandre Julliard
julliard at wine.codeweavers.com
Sat Sep 13 03:20:52 CDT 2014
Module: wine
Branch: master
Commit: 70d497943759599d980ea7d22d9ecbd2eec80b06
URL: http://source.winehq.org/git/wine.git/?a=commit;h=70d497943759599d980ea7d22d9ecbd2eec80b06
Author: Austin English <austinenglish at gmail.com>
Date: Thu Sep 11 18:02:21 2014 -0500
wineconsole: Only use getmouse when HAVE_MOUSEMASK is defined.
---
programs/wineconsole/curses.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c
index 77d7718..24aab88 100644
--- a/programs/wineconsole/curses.c
+++ b/programs/wineconsole/curses.c
@@ -99,7 +99,6 @@ MAKE_FUNCPTR(getmaxx)
#ifndef getmaxy
MAKE_FUNCPTR(getmaxy)
#endif
-MAKE_FUNCPTR(getmouse)
MAKE_FUNCPTR(has_colors)
MAKE_FUNCPTR(init_pair)
MAKE_FUNCPTR(initscr)
@@ -122,6 +121,7 @@ MAKE_FUNCPTR(waddchnstr)
MAKE_FUNCPTR(wmove)
MAKE_FUNCPTR(wgetch)
#ifdef HAVE_MOUSEMASK
+MAKE_FUNCPTR(getmouse)
MAKE_FUNCPTR(mouseinterval)
MAKE_FUNCPTR(mousemask)
#endif
@@ -163,7 +163,6 @@ static BOOL WCCURSES_bind_libcurses(void)
#ifndef getmaxy
LOAD_FUNCPTR(getmaxy)
#endif
- LOAD_FUNCPTR(getmouse)
LOAD_FUNCPTR(has_colors)
LOAD_FUNCPTR(init_pair)
LOAD_FUNCPTR(initscr)
@@ -186,6 +185,7 @@ static BOOL WCCURSES_bind_libcurses(void)
LOAD_FUNCPTR(wmove)
LOAD_FUNCPTR(wgetch)
#ifdef HAVE_MOUSEMASK
+ LOAD_FUNCPTR(getmouse)
LOAD_FUNCPTR(mouseinterval)
LOAD_FUNCPTR(mousemask)
#endif
@@ -214,7 +214,6 @@ sym_not_found:
#ifndef getmaxy
#define getmaxy p_getmaxy
#endif
-#define getmouse p_getmouse
#define has_colors p_has_colors
#define init_pair p_init_pair
#define initscr p_initscr
@@ -222,8 +221,11 @@ sym_not_found:
#define intrflush p_intrflush
#endif
#define keypad p_keypad
+#ifdef HAVE_MOUSEMASK
+#define getmouse p_getmouse
#define mouseinterval p_mouseinterval
#define mousemask p_mousemask
+#endif
#define newpad p_newpad
#ifndef nodelay
#define nodelay p_nodelay
More information about the wine-cvs
mailing list