diff options
| author | Patrick Cloke <clokep@gmail.com> | 2016-03-15 22:15:31 -0400 |
|---|---|---|
| committer | Patrick Cloke <clokep@gmail.com> | 2016-03-15 22:15:31 -0400 |
| commit | 0194f2f46a3f01013d1693fecf1bb9c1dcf029ed (patch) | |
| tree | 94c95e96fb689df092c9ca2a8aa1caacdd4cffeb | |
| parent | 7626286318dbc781c7b022e4c73c851aa58682f5 (diff) | |
| download | pidgin-0194f2f46a3f01013d1693fecf1bb9c1dcf029ed.tar.gz | |
Share mdns_win32 for both Windows and Mac OS X.
| -rw-r--r-- | libpurple/protocols/bonjour/Makefile.am | 4 | ||||
| -rw-r--r-- | libpurple/protocols/bonjour/Makefile.mingw | 2 | ||||
| -rw-r--r-- | libpurple/protocols/bonjour/mdns_dns_sd.c (renamed from libpurple/protocols/bonjour/mdns_win32.c) | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/libpurple/protocols/bonjour/Makefile.am b/libpurple/protocols/bonjour/Makefile.am index 1a9606cbbf..df2fb0ec80 100644 --- a/libpurple/protocols/bonjour/Makefile.am +++ b/libpurple/protocols/bonjour/Makefile.am @@ -1,5 +1,5 @@ EXTRA_DIST = \ - mdns_win32.c \ + mdns_dns_sd.c \ dns_sd_proxy.c \ dns_sd_proxy.h \ Makefile.mingw @@ -50,4 +50,4 @@ AM_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(DEBUG_CFLAGS) \ $(LIBXML_CFLAGS) \ - $(AVAHI_CFLAGS)
\ No newline at end of file + $(AVAHI_CFLAGS) diff --git a/libpurple/protocols/bonjour/Makefile.mingw b/libpurple/protocols/bonjour/Makefile.mingw index 7a7fe33ebb..836c5be11f 100644 --- a/libpurple/protocols/bonjour/Makefile.mingw +++ b/libpurple/protocols/bonjour/Makefile.mingw @@ -47,7 +47,7 @@ C_SRC = bonjour.c \ dns_sd_proxy.c \ jabber.c \ mdns_common.c \ - mdns_win32.c \ + mdns_dns_sd.c \ parser.c OBJECTS = $(C_SRC:%.c=%.o) diff --git a/libpurple/protocols/bonjour/mdns_win32.c b/libpurple/protocols/bonjour/mdns_dns_sd.c index 9f1798cf43..318c784e73 100644 --- a/libpurple/protocols/bonjour/mdns_win32.c +++ b/libpurple/protocols/bonjour/mdns_dns_sd.c @@ -24,7 +24,11 @@ #include "buddy.h" #include "mdns_interface.h" +#ifdef __APPLE_CC__ +#include <dns_sd.h> +#else #include "dns_sd_proxy.h" +#endif #include "mdns_common.h" #include "bonjour.h" |