From 4ae5b9fd336e16eb3d5eda2bd4c31c1a9f8c5fa9 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Mon, 22 Jan 2007 12:11:04 +0100 Subject: [PATCH] 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(+) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 0ac1026b7ac..e9f5604333d 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -27,6 +27,7 @@ #include #ifdef HAVE_LINUX_INPUT_H # include +# undef SW_MAX #endif #include #ifdef HAVE_UNISTD_H diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index ccaebf12759..ba63d9c8dab 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -52,6 +52,7 @@ #endif #ifdef HAVE_LINUX_JOYSTICK_H # include +# undef SW_MAX #endif #ifdef HAVE_SYS_POLL_H # include diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index a0ce49c06db..3815c229440 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -44,6 +44,7 @@ #endif #ifdef HAVE_LINUX_INPUT_H # include +# undef SW_MAX # if defined(EVIOCGBIT) && defined(EV_ABS) && defined(BTN_PINKIE) # define HAVE_CORRECT_LINUXINPUT_H # endif -- 2.11.4.GIT