Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/bonjour/dns_sd_proxy.h	Tue Dec 09 10:24:03 2014 +0100
+++ b/libpurple/protocols/bonjour/dns_sd_proxy.h	Tue Dec 16 18:18:42 2014 -0500
@@ -27,10 +27,8 @@
 #include <stdint.h>
 #endif
 
-#ifdef IS_WIN32_CROSS_COMPILED
-
-/* I'm not sure, if we really need to include this for the following definitions
- * modeled after Apple's dns_sd.h file.
+/* The following is a subset of Apple's dns_sd.h file
+ * http://www.opensource.apple.com/source/mDNSResponder/mDNSResponder-333.10/mDNSShared/dns_sd.h
  *
  * Copyright (c) 2003-2004, Apple Computer, Inc. All rights reserved.
  *
@@ -115,18 +113,9 @@
 	kDNSServiceProtocol_IPv4 = 0x01,
 };
 
-#else
-/* fixup to make pidgin compile against win32 bonjour */
-#  if defined(_WIN32) && !defined(_MSC_VER)
-#    define _MSL_STDINT_H
-#  endif
-#  include <dns_sd.h>
-#endif /* IS_WIN32_CROSS_COMPILED */
 
 gboolean dns_sd_available(void);
 
-#ifndef LINK_DNS_SD_DIRECTLY
-
 DNSServiceErrorType _wpurple_DNSServiceAddRecord(DNSServiceRef sdRef, DNSRecordRef *RecordRef, DNSServiceFlags flags,
 	uint16_t rrtype, uint16_t rdlen, const void *rdata, uint32_t ttl);
 #define DNSServiceAddRecord(sdRef, RecordRef, flags, rrtype, rdlen, rdata, ttl) \
@@ -207,6 +196,4 @@
 #define TXTRecordSetValue(txtRecord, key, valueSize, value) \
 	_wpurple_TXTRecordSetValue(txtRecord, key, valueSize, value)
 
-#endif /*LINK_DNS_SD_DIRECTLY*/
-
 #endif