| commit | 25f521f1b211551932b9bc7ff17d0dbb0cbd2413 | [log] [tgz] |
|---|---|---|
| author | Mike McCormack <mike@codeweavers.com> | Tue Jun 13 16:58:38 2006 +0900 |
| committer | Alexandre Julliard <julliard@winehq.org> | Tue Jun 13 12:56:38 2006 +0200 |
| tree | 0b516c2458fd7cf5d374b255bae9655def13882b | |
| parent | fee72b607a66732e09f0b2802cb6e3df1146a90f [diff] [blame] |
winmm: Undefine SW_MAX defined by linux/input.h to avoid a conflict with winuser.h.
diff --git a/dlls/winmm/joystick/joystick.c b/dlls/winmm/joystick/joystick.c index 17b86bd..094daff 100644 --- a/dlls/winmm/joystick/joystick.c +++ b/dlls/winmm/joystick/joystick.c
@@ -54,6 +54,9 @@ #endif #ifdef HAVE_LINUX_JOYSTICK_H #include <linux/joystick.h> +#ifdef SW_MAX +#undef SW_MAX +#endif #define JOYDEV_NEW "/dev/input/js%d" #define JOYDEV_OLD "/dev/js%d" #endif