Summary: | kdelibs/dnssd doesn't compile with libavahi-compat-libdnssd | ||
---|---|---|---|
Product: | [Frameworks and Libraries] kio | Reporter: | Hasso Tepper <hasso> |
Component: | zeroconf | Assignee: | Jakub Stachowski <qbast> |
Status: | RESOLVED FIXED | ||
Severity: | normal | CC: | schwarzer |
Priority: | NOR | ||
Version: | unspecified | ||
Target Milestone: | --- | ||
Platform: | Compiled Sources | ||
OS: | Linux | ||
Latest Commit: | Version Fixed In: | ||
Attachments: | Patch to fix the problem against 3.5 branch |
Description
Hasso Tepper
2006-09-17 16:42:55 UTC
Created attachment 17809 [details]
Patch to fix the problem against 3.5 branch
*** Bug 138963 has been marked as a duplicate of this bug. *** SVN commit 616448 by qbast: Make it compile with avahi-compat-dns_sd and newer versions of libdns_sd. Thanks to Hasso Tepper for the patch. Include config-dnssd.h instead of config.h so HAVE_DNSSD macro can actually be noticed. BUG: 134212 M +1 -1 publicservice.cpp M +4 -4 remoteservice.cpp M +1 -1 responder.h M +1 -1 servicebrowser.cpp --- trunk/KDE/kdelibs/dnssd/publicservice.cpp #616447:616448 @@ -18,7 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#include "config.h" +#include <config-dnssd.h> #include "publicservice.h" #ifdef HAVE_SYS_TYPES_H --- trunk/KDE/kdelibs/dnssd/remoteservice.cpp #616447:616448 @@ -18,7 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#include <config.h> +#include <config-dnssd.h> #include <qeventloop.h> #include <qapplication.h> @@ -43,7 +43,7 @@ const char *hosttarget, uint16_t port, uint16_t txtLen, - const char *txtRecord, + const unsigned char *txtRecord, void *context ); @@ -101,7 +101,7 @@ #ifdef HAVE_DNSSD DNSServiceRef ref; if (DNSServiceResolve(&ref,0,0,m_serviceName.toUtf8(), m_type.toAscii().constData(), - domainToDNS(m_domain),resolve_callback,reinterpret_cast<void*>(this)) + domainToDNS(m_domain),(DNSServiceResolveReply)resolve_callback,reinterpret_cast<void*>(this)) == kDNSServiceErr_NoError) d->setRef(ref); #endif if (!d->isRunning()) emit resolved(false); @@ -163,7 +163,7 @@ const char *hosttarget, uint16_t port, uint16_t txtLen, - const char *txtRecord, + const unsigned char *txtRecord, void *context ) { --- trunk/KDE/kdelibs/dnssd/responder.h #616447:616448 @@ -23,7 +23,7 @@ #include <qobject.h> #include <qsocketnotifier.h> -#include <config.h> +#include <config-dnssd.h> #ifdef HAVE_DNSSD #include <dns_sd.h> #else --- trunk/KDE/kdelibs/dnssd/servicebrowser.cpp #616447:616448 @@ -22,7 +22,7 @@ #include "domainbrowser.h" #include "query.h" #include "servicebrowser.h" -#include <config.h> +#include <config-dnssd.h> #include <QHash> #ifdef HAVE_DNSSD #include <dns_sd.h> |