Module: wine Branch: master Commit: 4dba8a4e27db04c4edec973115bc1288a039156b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dba8a4e27db04c4edec973115...
Author: Charles Davis cdavis5x@gmail.com Date: Tue Feb 16 13:51:19 2016 -0700
dinput: Don't define a debug channel when it isn't used.
Signed-off-by: Charles Davis cdavis5x@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/dinput/joystick_linux.c | 4 ++-- dlls/dinput/joystick_linuxinput.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 9921a28..261cee1 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -65,10 +65,10 @@ #include "device_private.h" #include "joystick_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(dinput); - #ifdef HAVE_LINUX_22_JOYSTICK_API
+WINE_DEFAULT_DEBUG_CHANNEL(dinput); + #define JOYDEV_NEW "/dev/input/js" #define JOYDEV_OLD "/dev/js" #define JOYDEVDRIVER " (js)" diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 4b4d69c..86f12d0 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -63,10 +63,10 @@ #include "device_private.h" #include "joystick_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(dinput); - #ifdef HAS_PROPER_HEADER
+WINE_DEFAULT_DEBUG_CHANNEL(dinput); + #define EVDEVPREFIX "/dev/input/event" #define EVDEVDRIVER " (event)"