Skip to content

W
wine-winehq
Commit 4ae5b9fd authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

dinput: Undefine SW_MAX to avoid possible conflicts with winuser.h.

parent 61b99343
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
dlls/dinput/effect_linuxinput.c
View file @ 4ae5b9fd
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <string.h> #include <string.h>
#ifdef HAVE_LINUX_INPUT_H #ifdef HAVE_LINUX_INPUT_H
# include <linux/input.h> # include <linux/input.h>
# undef SW_MAX
#endif #endif
#include <errno.h> #include <errno.h>
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
......
dlls/dinput/joystick_linux.c
View file @ 4ae5b9fd
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
#endif #endif
#ifdef HAVE_LINUX_JOYSTICK_H #ifdef HAVE_LINUX_JOYSTICK_H
# include <linux/joystick.h> # include <linux/joystick.h>
# undef SW_MAX
#endif #endif
#ifdef HAVE_SYS_POLL_H #ifdef HAVE_SYS_POLL_H
# include <sys/poll.h> # include <sys/poll.h>
......
dlls/dinput/joystick_linuxinput.c
View file @ 4ae5b9fd
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
#endif #endif
#ifdef HAVE_LINUX_INPUT_H #ifdef HAVE_LINUX_INPUT_H
# include <linux/input.h> # include <linux/input.h>
# undef SW_MAX
# if defined(EVIOCGBIT) && defined(EV_ABS) && defined(BTN_PINKIE) # if defined(EVIOCGBIT) && defined(EV_ABS) && defined(BTN_PINKIE)
# define HAVE_CORRECT_LINUXINPUT_H # define HAVE_CORRECT_LINUXINPUT_H
# endif # endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment