From: Brendan Shanks bshanks@codeweavers.com
--- configure.ac | 1 - dlls/ntdll/unix/cdrom.c | 2 +- dlls/ntdll/unix/system.c | 6 ++---- 3 files changed, 3 insertions(+), 6 deletions(-)
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 ) {