diff src/proxy.c @ 10626:06f5cc17cddc

[gaim-migrate @ 12101] Revert the change to use the g_thread based asynchronous DNS lookup. Use getaddrinfo on Win32. committer: Tailor Script <[e-mail]>

--- a/src/proxy.c	Wed Feb 23 02:14:18 2005 +0000
+++ b/src/proxy.c	Wed Feb 23 02:35:51 2005 +0000
@@ -189,7 +189,7 @@
 typedef void (*dns_callback_t)(GSList *hosts, gpointer data,
 		const char *error_message);
 
-#if 0
+#ifdef __unix__ 
 
 /*  This structure represents both a pending DNS request and
  *  a free child process.
@@ -634,7 +634,7 @@
 	return 0;
 }
 
-#elif defined G_THREADS_ENABLED
+#elif defined _WIN32 /* end __unix__ */
 
 typedef struct _dns_tdata {
 	char *hostname;
@@ -746,7 +746,7 @@
 	return 0;
 }
 
-#else /* not G_THREADS_ENABLED */
+#else /* not __unix__ or _WIN32 */
 
 typedef struct {
 	gpointer data;
@@ -1920,8 +1920,10 @@
 								proxy_pref_cb, NULL);
 	gaim_prefs_connect_callback(handle, "/core/proxy/password",
 								proxy_pref_cb, NULL);
+#ifdef _WIN32
 	if(!g_thread_supported())
 		g_thread_init(NULL);
+#endif
 }
 
 void *