Module: wine Branch: master Commit: 4ae5b9fd336e16eb3d5eda2bd4c31c1a9f8c5fa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ae5b9fd336e16eb3d5eda2bd4...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Jan 22 12:11:04 2007 +0100
dinput: Undefine SW_MAX to avoid possible conflicts with winuser.h.
---
dlls/dinput/effect_linuxinput.c | 1 + dlls/dinput/joystick_linux.c | 1 + dlls/dinput/joystick_linuxinput.c | 1 + 3 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 0ac1026..e9f5604 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -27,6 +27,7 @@ #include <string.h> #ifdef HAVE_LINUX_INPUT_H # include <linux/input.h> +# undef SW_MAX #endif #include <errno.h> #ifdef HAVE_UNISTD_H diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index ccaebf1..ba63d9c 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -52,6 +52,7 @@ #endif #ifdef HAVE_LINUX_JOYSTICK_H # include <linux/joystick.h> +# undef SW_MAX #endif #ifdef HAVE_SYS_POLL_H # include <sys/poll.h> diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index a0ce49c..3815c22 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -44,6 +44,7 @@ #endif #ifdef HAVE_LINUX_INPUT_H # include <linux/input.h> +# undef SW_MAX # if defined(EVIOCGBIT) && defined(EV_ABS) && defined(BTN_PINKIE) # define HAVE_CORRECT_LINUXINPUT_H # endif