From: Brendan Shanks bshanks@codeweavers.com
--- configure.ac | 2 -- dlls/mountmgr.sys/dbus.c | 2 +- dlls/mountmgr.sys/diskarb.c | 4 +--- 3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac index 836dd393517..b0988819b85 100644 --- a/configure.ac +++ b/configure.ac @@ -409,8 +409,6 @@ AC_CHECK_HEADERS(\ CL/cl.h \ EGL/egl.h \ OpenCL/opencl.h \ - SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h \ - SystemConfiguration/SCNetworkConfiguration.h \ arpa/inet.h \ arpa/nameser.h \ asm/types.h \ diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c index cc115751a19..6fe6984c218 100644 --- a/dlls/mountmgr.sys/dbus.c +++ b/dlls/mountmgr.sys/dbus.c @@ -573,7 +573,7 @@ found: while (p_dbus_connection_read_write_dispatch( connection, -1 )) /* nothing */ ; }
-#if !defined(HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H) || !defined(HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H) +#if !defined(__APPLE__)
/* The udisks dispatch loop will block all threads using the same connection, so we'll use a private connection. Multiple threads can make methods calls at the same time diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 18d4b65a625..4817cfc61d6 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -33,8 +33,6 @@ #include <sys/ioctl.h> #ifdef __APPLE__ #include <DiskArbitration/DiskArbitration.h> -#endif -#if defined(HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H) && defined(HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H) #include <SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h> #include <SystemConfiguration/SCNetworkConfiguration.h> #endif @@ -227,7 +225,7 @@ void run_diskarbitration_loop(void)
#endif /* __APPLE__ */
-#if defined(HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H) && defined(HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H) +#if defined(__APPLE__)
static UInt8 map_option( unsigned int option ) {