From 25f521f1b211551932b9bc7ff17d0dbb0cbd2413 Mon Sep 17 00:00:00 2001 From: Mike McCormack Date: Tue, 13 Jun 2006 16:58:38 +0900 Subject: [PATCH] winmm: Undefine SW_MAX defined by linux/input.h to avoid a conflict with winuser.h. --- dlls/winmm/joystick/joystick.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winmm/joystick/joystick.c b/dlls/winmm/joystick/joystick.c index 17b86bdba47..094daff76b0 100644 --- a/dlls/winmm/joystick/joystick.c +++ b/dlls/winmm/joystick/joystick.c @@ -54,6 +54,9 @@ #endif #ifdef HAVE_LINUX_JOYSTICK_H #include +#ifdef SW_MAX +#undef SW_MAX +#endif #define JOYDEV_NEW "/dev/input/js%d" #define JOYDEV_OLD "/dev/js%d" #endif