Brendan Shanks : configure: Remove check for the HID Manager (always present on macOS).

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ab8103e0e326b278370389cb02c6dd76ec6732f5
URL:    https://gitlab.winehq.org/wine/wine/-/commit/ab8103e0e326b278370389cb02c6dd7...

Author: Brendan Shanks 
Date:   Tue Nov 22 13:37:22 2022 -0800

configure: Remove check for the HID Manager (always present on macOS).

---

configure                    | 19 -------------------
 configure.ac                 |  8 --------
 dlls/winebus.sys/bus_iohid.c |  8 ++++----
 include/config.h.in          |  6 ------
 4 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/configure b/configure
index 4de5e53629d..d2e785eb542 100755
--- a/configure
+++ b/configure
@@ -7861,12 +7861,6 @@ if test "x$ac_cv_header_IOKit_IOKitLib_h" = xyes
 then :
   printf "%s\n" "#define HAVE_IOKIT_IOKITLIB_H 1" >>confdefs.h

-fi
-ac_fn_c_check_header_compile "$LINENO" "IOKit/hid/IOHIDLib.h" "ac_cv_header_IOKit_hid_IOHIDLib_h" "$ac_includes_default"
-if test "x$ac_cv_header_IOKit_hid_IOHIDLib_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_IOKIT_HID_IOHIDLIB_H 1" >>confdefs.h
-
 fi
 ac_fn_c_check_header_compile "$LINENO" "OpenCL/opencl.h" "ac_cv_header_OpenCL_opencl_h" "$ac_includes_default"
 if test "x$ac_cv_header_OpenCL_opencl_h" = xyes
@@ -9946,19 +9940,6 @@ fi

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_fn_c_check_func "$LINENO" "IOHIDManagerCreate" "ac_cv_func_IOHIDManagerCreate"
-if test "x$ac_cv_func_IOHIDManagerCreate" = xyes
-then :
-  printf "%s\n" "#define HAVE_IOHIDMANAGERCREATE 1" >>confdefs.h
-
-fi
-
-        LIBS="$ac_save_LIBS"
-    fi

if test "$ac_cv_header_Metal_Metal_h" = "yes"
     then
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__ */
diff --git a/include/config.h.in b/include/config.h.in
index 3c42a13525e..ed55ed7ad78 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -111,12 +111,6 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H

-/* Define to 1 if you have the `IOHIDManagerCreate' function. */
-#undef HAVE_IOHIDMANAGERCREATE
-
-/* Define to 1 if you have the <IOKit/hid/IOHIDLib.h> header file. */
-#undef HAVE_IOKIT_HID_IOHIDLIB_H
-
 /* Define to 1 if you have the <IOKit/IOKitLib.h> header file. */
 #undef HAVE_IOKIT_IOKITLIB_H