From b04c27e47e3039ef6ee6cc4dd38a71654551b240 Mon Sep 17 00:00:00 2001 From: Jonathan Bagg Date: Sun, 26 Feb 2017 17:43:37 -0500 Subject: [PATCH] Fix compiling with msvc. "interface" is a keyword. --- avahiclient.cpp | 2 +- avahicore.cpp | 2 +- bonjour.cpp | 4 ++-- qzeroconf.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/avahiclient.cpp b/avahiclient.cpp index 9970bb5..3f350e3 100644 --- a/avahiclient.cpp +++ b/avahiclient.cpp @@ -158,7 +158,7 @@ public: zcs->type = type; zcs->domain = domain; zcs->host = host_name; - zcs->interface = interface; + zcs->interfaceIndex = interface; zcs->port = port; ref->pub->services.insert(key, zcs); } diff --git a/avahicore.cpp b/avahicore.cpp index 21a1a05..c547067 100644 --- a/avahicore.cpp +++ b/avahicore.cpp @@ -170,7 +170,7 @@ public: zcs->type = type; zcs->domain = domain; zcs->host = host_name; - zcs->interface = interface; + zcs->interfaceIndex = interface; zcs->port = port; ref->pub->services.insert(key, zcs); } diff --git a/bonjour.cpp b/bonjour.cpp index 2ff61e2..a0e9e32 100644 --- a/bonjour.cpp +++ b/bonjour.cpp @@ -69,7 +69,7 @@ void QZeroConfPrivate::resolve(void) { DNSServiceErrorType err; - err = DNSServiceResolve(&resolver, kDNSServiceFlagsTimeout, newService->interface, newService->name.toUtf8(), newService->type.toUtf8(), newService->domain.toUtf8(), (DNSServiceResolveReply) resolverCallback, this); + err = DNSServiceResolve(&resolver, kDNSServiceFlagsTimeout, newService->interfaceIndex, newService->name.toUtf8(), newService->type.toUtf8(), newService->domain.toUtf8(), (DNSServiceResolveReply) resolverCallback, this); if (err == kDNSServiceErr_NoError) { int sockfd = DNSServiceRefSockFD(resolver); if (sockfd == -1) { @@ -115,7 +115,7 @@ void DNSSD_API QZeroConfPrivate::browseCallback(DNSServiceRef, DNSServiceFlags f zcs->name = name; zcs->type = type; zcs->domain = domain; - zcs->interface = interfaceIndex; + zcs->interfaceIndex = interfaceIndex; if (!ref->newService) { ref->newService = zcs; ref->resolve(); diff --git a/qzeroconf.h b/qzeroconf.h index 450bc51..a5d64af 100644 --- a/qzeroconf.h +++ b/qzeroconf.h @@ -39,7 +39,7 @@ struct QZeroConfService QString host; QHostAddress ip; QHostAddress ipv6; - quint32 interface; + quint32 interfaceIndex; quint16 port; };