[Gaim-commits] SF.net SVN: gaim: [16049] trunk/src/proxy.c

[<ev...@us...>]

Revision: 16049
Author:   evands
Date:     2006-04-17 12:28:15 -0700 (Mon, 17 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16049&view=rev

Log Message:
-----------
__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"

Modified Paths:
--------------
    trunk/src/proxy.c
Modified: trunk/src/proxy.c
===================================================================
--- trunk/src/proxy.c	2006-04-17 18:36:26 UTC (rev 16048)
+++ trunk/src/proxy.c	2006-04-17 19:28:15 UTC (rev 16049)
@@ -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)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.