Mercurial > pidgin.yaz
changeset 26827:e5c874075b42
Build error/warning fixes. Still not tested because libxmpp.dll won't load.
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Tue, 28 Apr 2009 23:03:09 +0000 |
| parents | 45271de9c65d |
| children | 934bc523239f |
| files | libpurple/dnssrv.c libpurple/protocols/jabber/Makefile.mingw |
| diffstat | 2 files changed, 5 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/dnssrv.c Tue Apr 28 22:20:01 2009 +0000 +++ b/libpurple/dnssrv.c Tue Apr 28 23:03:09 2009 +0000 @@ -291,13 +291,12 @@ res_main_thread_cb(gpointer data) { PurpleSrvResponse *srvres = NULL; - PurpleTxtResponse *txtres = NULL; int size = 0; PurpleSrvQueryData *query_data = data; if(query_data->error_message != NULL) purple_debug_error("dnssrv", query_data->error_message); else { - if (query_data->type == T_SRV) { + if (query_data->type == DNS_TYPE_SRV) { PurpleSrvResponse *srvres_tmp = NULL; GSList *lst = query_data->results; @@ -317,8 +316,7 @@ purple_debug_info("dnssrv", "found %d SRV entries\n", size); if(query_data->cb.srv) query_data->cb.srv(srvres, size, query_data->extradata); - } else if (query_data->type == T_TXT) { - PurpleTxtResponse *txtres_tmp = NULL; + } else if (query_data->type == DNS_TYPE_TXT) { GSList *lst = query_data->results; purple_debug_info("dnssrv", "found %d TXT entries\n", g_slist_length(lst)); @@ -431,8 +429,8 @@ { char *query; PurpleSrvQueryData *query_data; +#ifndef _WIN32 PurpleSrvInternalQuery internal_query; -#ifndef _WIN32 int in[2], out[2]; int pid; #else @@ -536,8 +534,8 @@ { char *query; PurpleSrvQueryData *query_data; +#ifndef _WIN32 PurpleSrvInternalQuery internal_query; -#ifndef _WIN32 int in[2], out[2]; int pid; #else