pidgin: c415fb52: Bonjour build fixes for MSVC.

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: c415fb5218cbed38ddadcf7921dda6619d3d683f
Ancestor: ba6112dabbb907fd5e93c30e0f5228e557949d69
Author: datallah at pidgin.im
Date: 2008-05-12T02:08:04
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c415fb5218cbed38ddadcf7921dda6619d3d683f

Modified files:
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/dns_sd_proxy.h
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/parser.c

ChangeLog: 

Bonjour build fixes for MSVC.

-------------- next part --------------
============================================================
--- libpurple/protocols/bonjour/bonjour.c	193d7ec7ffc3265767b73922ece594d556189bef
+++ libpurple/protocols/bonjour/bonjour.c	2a5d7a3c804f55a2cacb6e426346a2c05df8edc0
@@ -24,6 +24,7 @@
 #include <pwd.h>
 #else
 #define UNICODE
+#include <winsock2.h>
 #include <windows.h>
 #include <lm.h>
 #include "dns_sd_proxy.h"
============================================================
--- libpurple/protocols/bonjour/dns_sd_proxy.h	ef8b2066d3abc473afaf1119d6b7589fbfa2d704
+++ libpurple/protocols/bonjour/dns_sd_proxy.h	405efc1890eaa51e7a27046d25b734208563dbd5
@@ -21,10 +21,13 @@
 #ifndef _DNS_SD_PROXY
 #define _DNS_SD_PROXY
 
+
+#ifndef _MSC_VER
 #include <stdint.h>
+#endif
 
 /* fixup to make pidgin compile against win32 bonjour */
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(_MSC_VER)
 #define _MSL_STDINT_H
 #endif
 
============================================================
--- libpurple/protocols/bonjour/jabber.c	8f59d1a97da79b07ba34324f4cb25d00f8f43250
+++ libpurple/protocols/bonjour/jabber.c	2b23b0bc19881a7d5dcb92feb100710e7dfb1ad4
@@ -39,7 +39,9 @@
 #endif
 
 #include <glib.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <fcntl.h>
 
 #include "network.h"
============================================================
--- libpurple/protocols/bonjour/parser.c	b964a0d43937b3156db2e38ef686d39a29bf4c6b
+++ libpurple/protocols/bonjour/parser.c	2f4fc9959ef5e33edb692e66f8ef5417dbf1cb18
@@ -157,38 +157,38 @@ static xmlSAXHandler bonjour_parser_libx
 }
 
 static xmlSAXHandler bonjour_parser_libxml = {
-	.internalSubset         = NULL,
-	.isStandalone           = NULL,
-	.hasInternalSubset      = NULL,
-	.hasExternalSubset      = NULL,
-	.resolveEntity          = NULL,
-	.getEntity              = NULL,
-	.entityDecl             = NULL,
-	.notationDecl           = NULL,
-	.attributeDecl          = NULL,
-	.elementDecl            = NULL,
-	.unparsedEntityDecl     = NULL,
-	.setDocumentLocator     = NULL,
-	.startDocument          = NULL,
-	.endDocument            = NULL,
-	.startElement           = NULL,
-	.endElement             = NULL,
-	.reference              = NULL,
-	.characters             = bonjour_parser_element_text_libxml,
-	.ignorableWhitespace    = NULL,
-	.processingInstruction  = NULL,
-	.comment                = NULL,
-	.warning                = NULL,
-	.error                  = NULL,
-	.fatalError             = NULL,
-	.getParameterEntity     = NULL,
-	.cdataBlock             = NULL,
-	.externalSubset         = NULL,
-	.initialized            = XML_SAX2_MAGIC,
-	._private               = NULL,
-	.startElementNs         = bonjour_parser_element_start_libxml,
-	.endElementNs           = bonjour_parser_element_end_libxml,
-	.serror                 = NULL
+	NULL,									/*internalSubset*/
+	NULL,									/*isStandalone*/
+	NULL,									/*hasInternalSubset*/
+	NULL,									/*hasExternalSubset*/
+	NULL,									/*resolveEntity*/
+	NULL,									/*getEntity*/
+	NULL,									/*entityDecl*/
+	NULL,									/*notationDecl*/
+	NULL,									/*attributeDecl*/
+	NULL,									/*elementDecl*/
+	NULL,									/*unparsedEntityDecl*/
+	NULL,									/*setDocumentLocator*/
+	NULL,									/*startDocument*/
+	NULL,									/*endDocument*/
+	NULL,									/*startElement*/
+	NULL,									/*endElement*/
+	NULL,									/*reference*/
+	bonjour_parser_element_text_libxml,		/*characters*/
+	NULL,									/*ignorableWhitespace*/
+	NULL,									/*processingInstruction*/
+	NULL,									/*comment*/
+	NULL,									/*warning*/
+	NULL,									/*error*/
+	NULL,									/*fatalError*/
+	NULL,									/*getParameterEntity*/
+	NULL,									/*cdataBlock*/
+	NULL,									/*externalSubset*/
+	XML_SAX2_MAGIC,							/*initialized*/
+	NULL,									/*_private*/
+	bonjour_parser_element_start_libxml,	/*startElementNs*/
+	bonjour_parser_element_end_libxml,		/*endElementNs*/
+	NULL									/*serror*/
 };
 
 void