From ab7f16795ab8201efa90aac9c4f397b63281b38f Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Mon, 1 Jun 2015 09:16:17 -0400 Subject: [PATCH] Fixing non Mac OS builds. --- QGCExternalLibs.pri | 2 ++ src/comm/UDPLink.cc | 2 ++ src/comm/UDPLink.h | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri index 4ae555ca9..0e73c3afd 100644 --- a/QGCExternalLibs.pri +++ b/QGCExternalLibs.pri @@ -292,5 +292,7 @@ contains (DEFINES, DISABLE_ZEROCONF) { } else:MacBuild|iOSBuild { message("Including support for Zeroconf (Bonjour)") DEFINES += QGC_ZEROCONF_ENABLED +} else { + message("Skipping support for Zeroconf (unsupported platform)") } diff --git a/src/comm/UDPLink.cc b/src/comm/UDPLink.cc index 5669a5d8d..4ebf8fb60 100644 --- a/src/comm/UDPLink.cc +++ b/src/comm/UDPLink.cc @@ -77,7 +77,9 @@ static QString get_ip_address(const QString& address) UDPLink::UDPLink(UDPConfiguration* config) : _socket(NULL) , _connectState(false) + #if defined(QGC_ZEROCONF_ENABLED) , _dnssServiceRef(NULL) + #endif { Q_ASSERT(config != NULL); _config = config; diff --git a/src/comm/UDPLink.h b/src/comm/UDPLink.h index f333bac71..76c0c3479 100644 --- a/src/comm/UDPLink.h +++ b/src/comm/UDPLink.h @@ -205,9 +205,10 @@ private: bool _hardwareConnect(); void _restartConnection(); -#if defined(QGC_ZEROCONF_ENABLED) void _registerZeroconf(uint16_t port, const std::string& regType); void _deregisterZeroconf(); + +#if defined(QGC_ZEROCONF_ENABLED) DNSServiceRef _dnssServiceRef; #endif -- 2.22.0