/pidgin/main: ca46fc6c7be5: Share mdns_win32 for both Windows an...
Patrick Cloke <[email protected]>
| Newsgroups | gmane.comp.gnome.gaim.cvs |
|---|---|
| Message-ID | <[email protected]> |
Changeset: ca46fc6c7be580078e268475667024a1cf0c3b60 Author: Patrick Cloke <[email protected]> Date: 2016-03-15 22:15 -0400 Branch: fix-bonjour-mac URL: https://hg.pidgin.im/pidgin/main/rev/ca46fc6c7be5 Description: Share mdns_win32 for both Windows and Mac OS X. diffstat: libpurple/protocols/bonjour/Makefile.am | 4 ++-- libpurple/protocols/bonjour/Makefile.mingw | 2 +- libpurple/protocols/bonjour/mdns_dns_sd.c | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diffs (46 lines): diff --git a/libpurple/protocols/bonjour/Makefile.am b/libpurple/protocols/bonjour/Makefile.am --- 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 --- 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 rename from libpurple/protocols/bonjour/mdns_win32.c rename to libpurple/protocols/bonjour/mdns_dns_sd.c --- 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" _______________________________________________ Commits mailing list [email protected] https://pidgin.im/cgi-bin/mailman/listinfo/commits