Fix compiling with msvc. "interface" is a keyword.

This commit is contained in:
Jonathan Bagg
2017-02-26 17:43:37 -05:00
parent efd3f49bd0
commit b04c27e47e
4 changed files with 5 additions and 5 deletions

View File

@ -158,7 +158,7 @@ public:
zcs->type = type; zcs->type = type;
zcs->domain = domain; zcs->domain = domain;
zcs->host = host_name; zcs->host = host_name;
zcs->interface = interface; zcs->interfaceIndex = interface;
zcs->port = port; zcs->port = port;
ref->pub->services.insert(key, zcs); ref->pub->services.insert(key, zcs);
} }

View File

@ -170,7 +170,7 @@ public:
zcs->type = type; zcs->type = type;
zcs->domain = domain; zcs->domain = domain;
zcs->host = host_name; zcs->host = host_name;
zcs->interface = interface; zcs->interfaceIndex = interface;
zcs->port = port; zcs->port = port;
ref->pub->services.insert(key, zcs); ref->pub->services.insert(key, zcs);
} }

View File

@ -69,7 +69,7 @@ void QZeroConfPrivate::resolve(void)
{ {
DNSServiceErrorType err; 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) { if (err == kDNSServiceErr_NoError) {
int sockfd = DNSServiceRefSockFD(resolver); int sockfd = DNSServiceRefSockFD(resolver);
if (sockfd == -1) { if (sockfd == -1) {
@ -115,7 +115,7 @@ void DNSSD_API QZeroConfPrivate::browseCallback(DNSServiceRef, DNSServiceFlags f
zcs->name = name; zcs->name = name;
zcs->type = type; zcs->type = type;
zcs->domain = domain; zcs->domain = domain;
zcs->interface = interfaceIndex; zcs->interfaceIndex = interfaceIndex;
if (!ref->newService) { if (!ref->newService) {
ref->newService = zcs; ref->newService = zcs;
ref->resolve(); ref->resolve();

View File

@ -39,7 +39,7 @@ struct QZeroConfService
QString host; QString host;
QHostAddress ip; QHostAddress ip;
QHostAddress ipv6; QHostAddress ipv6;
quint32 interface; quint32 interfaceIndex;
quint16 port; quint16 port;
}; };