[PATCH] mountmgr.sys: Fix the build on macOS when dbus libraries are present.

Hans Leidekker hans at codeweavers.com
Wed Nov 20 07:29:05 CST 2019


Reported by Gijs Vermeulen.

Signed-off-by: Hans Leidekker <hans at codeweavers.com>
---
 dlls/mountmgr.sys/dbus.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c
index f85c2e3707..fbdcdb9e2e 100644
--- a/dlls/mountmgr.sys/dbus.c
+++ b/dlls/mountmgr.sys/dbus.c
@@ -771,6 +771,8 @@ void initialize_dbus(void)
     CloseHandle( handle );
 }
 
+#if !defined(HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H) || !defined(HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H)
+
 /* 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
    on the same connection, according to the documentation.
@@ -1033,6 +1035,7 @@ ULONG get_dhcp_request_param( const WCHAR *adapter, struct mountmgr_dhcp_request
     p_dbus_message_unref( reply );
     return ret;
 }
+#endif
 
 #else  /* SONAME_LIBDBUS_1 */
 
-- 
2.20.1




More information about the wine-devel mailing list