From: Brendan Shanks bshanks@codeweavers.com
--- configure.ac | 8 -------- dlls/winebus.sys/bus_iohid.c | 8 ++++---- 2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/configure.ac b/configure.ac index a80310fee3b..cff7d5d899b 100644 --- a/configure.ac +++ b/configure.ac @@ -409,7 +409,6 @@ AC_CHECK_HEADERS(\ CL/cl.h \ EGL/egl.h \ IOKit/IOKitLib.h \ - IOKit/hid/IOHIDLib.h \ OpenCL/opencl.h \ Security/Security.h \ SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h \ @@ -724,13 +723,6 @@ case $host_os in AC_SUBST(OPENCL_LIBS,"-framework OpenCL") ac_cv_lib_OpenCL_clGetPlatformInfo=yes fi - if test "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" - then - ac_save_LIBS="$LIBS" - LIBS="$LIBS $IOKIT_LIBS" - AC_CHECK_FUNCS(IOHIDManagerCreate) - LIBS="$ac_save_LIBS" - fi
if test "$ac_cv_header_Metal_Metal_h" = "yes" then diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index e0527739199..99334d141bb 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -26,7 +26,7 @@ #include <stdarg.h> #include <sys/types.h>
-#if defined(HAVE_IOKIT_HID_IOHIDLIB_H) +#ifdef __APPLE__ #define DWORD UInt32 #define LPDWORD UInt32* #define LONG SInt32 @@ -81,7 +81,7 @@ #undef LPLONG #undef E_PENDING #undef PAGE_SHIFT -#endif /* HAVE_IOKIT_HID_IOHIDLIB_H */ +#endif /* __APPLE__ */
#include <pthread.h>
@@ -98,7 +98,7 @@ #include "unix_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(hid); -#ifdef HAVE_IOHIDMANAGERCREATE +#ifdef __APPLE__
static pthread_mutex_t iohid_cs = PTHREAD_MUTEX_INITIALIZER;
@@ -441,4 +441,4 @@ NTSTATUS iohid_bus_stop(void *args) return STATUS_NOT_IMPLEMENTED; }
-#endif /* HAVE_IOHIDMANAGERCREATE */ +#endif /* __APPLE__ */