Mercurial > pidgin.yaz
changeset 10626:06f5cc17cddc
[gaim-migrate @ 12101]
Revert the change to use the g_thread based asynchronous DNS lookup. Use getaddrinfo on Win32.
committer: Tailor Script <tailor@pidgin.im>
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Wed, 23 Feb 2005 02:35:51 +0000 |
| parents | 9eb235c6dc0a |
| children | 57589eb36449 |
| files | config.h.mingw configure.ac src/proxy.c |
| diffstat | 3 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/config.h.mingw Wed Feb 23 02:14:18 2005 +0000 +++ b/config.h.mingw Wed Feb 23 02:35:51 2005 +0000 @@ -125,7 +125,7 @@ /* #undef HAVE_FGETS_UNLOCKED */ /* Define if you have the getaddrinfo function. */ -/* #undef HAVE_GETADDRINFO */ +#define HAVE_GETADDRINFO 1 /* Define if you have the getcwd function. */ #define HAVE_GETCWD 1
--- a/configure.ac Wed Feb 23 02:14:18 2005 +0000 +++ b/configure.ac Wed Feb 23 02:35:51 2005 +0000 @@ -272,7 +272,7 @@ AM_PATH_GTK_2_0(2.0.0,,AC_MSG_ERROR([ *** GTK+ 2.0 is required to build Gaim; please make sure you have the GTK+ *** development headers installed. The latest version of GTK+ is -*** always available at http://www.gtk.org/.]), gthread) +*** always available at http://www.gtk.org/.])) AC_PATH_PROG(gaimpath, gaim) AC_SUBST(GTK_CFLAGS)
--- 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 *