# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1240959789 0
# Node ID e5c874075b424f199aa35c092cd7017ad6cdbf4d
# Parent  45271de9c65d4a1892c7f762a186ce1915221d92
Build error/warning fixes. Still not tested because libxmpp.dll won't load.

diff -r 45271de9c65d -r e5c874075b42 libpurple/dnssrv.c
--- 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
diff -r 45271de9c65d -r e5c874075b42 libpurple/protocols/jabber/Makefile.mingw
--- a/libpurple/protocols/jabber/Makefile.mingw	Tue Apr 28 22:20:01 2009 +0000
+++ b/libpurple/protocols/jabber/Makefile.mingw	Tue Apr 28 23:03:09 2009 +0000
@@ -71,6 +71,7 @@
 			presence.c \
 			roster.c \
 			si.c \
+			useravatar.c \
 			usermood.c \
 			usernick.c \
 			usertune.c \