Module: wine Branch: master Commit: 9645beb5c07685c521fa5718814ab2b13cf52f5b URL: https://gitlab.winehq.org/wine/wine/-/commit/9645beb5c07685c521fa5718814ab2b...
Author: Brendan Shanks bshanks@codeweavers.com Date: Tue Nov 22 14:02:40 2022 -0800
configure: Remove check for IOKit (always present on macOS).
---
configure | 6 ------ configure.ac | 1 - dlls/ntdll/unix/cdrom.c | 2 +- dlls/ntdll/unix/system.c | 6 ++---- include/config.h.in | 3 --- 5 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/configure b/configure index d2e785eb542..e09b930d702 100755 --- a/configure +++ b/configure @@ -7855,12 +7855,6 @@ if test "x$ac_cv_header_EGL_egl_h" = xyes then : printf "%s\n" "#define HAVE_EGL_EGL_H 1" >>confdefs.h
-fi -ac_fn_c_check_header_compile "$LINENO" "IOKit/IOKitLib.h" "ac_cv_header_IOKit_IOKitLib_h" "$ac_includes_default" -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" "OpenCL/opencl.h" "ac_cv_header_OpenCL_opencl_h" "$ac_includes_default" if test "x$ac_cv_header_OpenCL_opencl_h" = xyes diff --git a/configure.ac b/configure.ac index cff7d5d899b..8689c7ba425 100644 --- a/configure.ac +++ b/configure.ac @@ -408,7 +408,6 @@ AC_CHECK_HEADERS(\ AL/al.h \ CL/cl.h \ EGL/egl.h \ - IOKit/IOKitLib.h \ OpenCL/opencl.h \ Security/Security.h \ SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h \ diff --git a/dlls/ntdll/unix/cdrom.c b/dlls/ntdll/unix/cdrom.c index 5ee4fecf26b..661a7067168 100644 --- a/dlls/ntdll/unix/cdrom.c +++ b/dlls/ntdll/unix/cdrom.c @@ -75,7 +75,7 @@ # include <sys/scsiio.h> #endif
-#ifdef HAVE_IOKIT_IOKITLIB_H +#ifdef __APPLE__ # include <libkern/OSByteOrder.h> # include <sys/disk.h> # include <IOKit/IOKitLib.h> diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 2dc99316f9c..b9be2f53752 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -54,14 +54,12 @@ #ifdef HAVE_SYS_RESOURCE_H # include <sys/resource.h> #endif -#ifdef HAVE_IOKIT_IOKITLIB_H +#ifdef __APPLE__ # include <CoreFoundation/CoreFoundation.h> # include <IOKit/IOKitLib.h> # include <IOKit/pwr_mgt/IOPM.h> # include <IOKit/pwr_mgt/IOPMLib.h> # include <IOKit/ps/IOPowerSources.h> -#endif -#ifdef __APPLE__ # include <mach/mach.h> # include <mach/machine.h> # include <mach/mach_init.h> @@ -3484,7 +3482,7 @@ static NTSTATUS fill_battery_state( SYSTEM_BATTERY_STATE *bs ) return STATUS_SUCCESS; }
-#elif defined(HAVE_IOKIT_IOKITLIB_H) +#elif defined(__APPLE__)
static NTSTATUS fill_battery_state( SYSTEM_BATTERY_STATE *bs ) { diff --git a/include/config.h.in b/include/config.h.in index ed55ed7ad78..e80ede4260f 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -111,9 +111,6 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H
-/* Define to 1 if you have the <IOKit/IOKitLib.h> header file. */ -#undef HAVE_IOKIT_IOKITLIB_H - /* Define to 1 if you have the `kqueue' function. */ #undef HAVE_KQUEUE