# HG changeset patch # User Evan Schoenberg # Date 1145302095 0 # Node ID 3eba1e7458c727a79e01549be71a91232ebf2277 # Parent 1003b97adce9d62bfddc6385d14370b657383164 [gaim-migrate @ 16049] __unix__ is not defined in Mac OS X [1], but this code for asynchronous DNS lookups works fine on that platform (at least as of OS X 10.3.9). We now check for __unix__ or __APPLE__ being defined. [1] http://developer.apple.com/technotes/tn2002/tn2071.html - under the section "Predefined Macros" committer: Tailor Script diff -r 1003b97adce9 -r 3eba1e7458c7 src/proxy.c --- a/src/proxy.c Mon Apr 17 18:36:26 2006 +0000 +++ b/src/proxy.c Mon Apr 17 19:28:15 2006 +0000 @@ -261,7 +261,7 @@ * Proxy API **************************************************************************/ -#ifdef __unix__ +#if defined(__unix__) || defined(__APPLE__) /* * This structure represents both a pending DNS request and @@ -768,7 +768,7 @@ return 0; } -#elif defined _WIN32 /* end __unix__ */ +#elif defined _WIN32 /* end __unix__ || __APPLE__ */ typedef struct _dns_tdata { char *hostname; @@ -882,7 +882,7 @@ return 0; } -#else /* not __unix__ or _WIN32 */ +#else /* not __unix__ or __APPLE__ or _WIN32 */ typedef struct { gpointer data; @@ -933,7 +933,7 @@ return 0; } -#endif /* not __unix__ or _WIN32 */ +#endif /* not __unix__ or __APPLE__ or _WIN32 */ static void no_one_calls(gpointer data, gint source, GaimInputCondition cond)