Module: wine Branch: refs/heads/master Commit: 25f521f1b211551932b9bc7ff17d0dbb0cbd2413 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=25f521f1b211551932b9bc7f...
Author: Mike McCormack mike@codeweavers.com Date: Tue Jun 13 16:58:38 2006 +0900
winmm: Undefine SW_MAX defined by linux/input.h to avoid a conflict with winuser.h.
---
dlls/winmm/joystick/joystick.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
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 @@ #include <linux/ioctl.h> #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