Hans Leidekker : mountmgr.sys: Fix the build on macOS when dbus libraries are present.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4692ae3f0f78443c5a10179d7dc7b5f119d67112
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=4692ae3f0f78443c5a10179d7...

Author: Hans Leidekker <hans(a)codeweavers.com>
Date:   Wed Nov 20 14:29:05 2019 +0100

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

Reported by Gijs Vermeulen.

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/mountmgr.sys/dbus.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c
index f85c2e3707..4ccfb2a79c 100644
--- a/dlls/mountmgr.sys/dbus.c
+++ b/dlls/mountmgr.sys/dbus.c
@@ -25,7 +25,6 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/time.h>
 #ifdef SONAME_LIBDBUS_1
 # include <dbus/dbus.h>
 #endif
@@ -771,6 +770,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 +1034,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 */