pidgin: 333ccba7: Build fixes for MSVC

datallah at pidgin.im datallah at pidgin.im
Sun May 11 22:35:39 EDT 2008


-----------------------------------------------------------------
Revision: 333ccba77a477d6b5bbcd6dcde4d8afcc0093cc5
Ancestor: c22962fce1042f2b22830d85f9cdcb45a5a570ec
Author: datallah at pidgin.im
Date: 2008-05-12T02:24:20
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/333ccba77a477d6b5bbcd6dcde4d8afcc0093cc5

Modified files:
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/httpconn.h
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/servconn.h
        libpurple/protocols/msn/soap2.c

ChangeLog: 

Build fixes for MSVC

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/httpconn.c	5bf2bf3549f33d621de9ed37eda52dc472ce0ca6
+++ libpurple/protocols/msn/httpconn.c	5f34edae8977e7556bc312fdd5b7dc77fc91f57a
@@ -438,7 +438,7 @@ write_raw(MsnHttpConn *httpconn, const c
 static gboolean
 write_raw(MsnHttpConn *httpconn, const char *data, size_t data_len)
 {
-	ssize_t res; /* result of the write operation */
+	gssize res; /* result of the write operation */
 
 	if (httpconn->tx_handler == 0)
 		res = write(httpconn->fd, data, data_len);
@@ -551,7 +551,7 @@ msn_httpconn_poll(gpointer data)
 	return TRUE;
 }
 
-ssize_t
+gssize
 msn_httpconn_write(MsnHttpConn *httpconn, const char *body, size_t body_len)
 {
 	char *params;
============================================================
--- libpurple/protocols/msn/httpconn.h	e40d1fa32618034a5b18e3783648d7f1cc536b3b
+++ libpurple/protocols/msn/httpconn.h	0889574fb91f0e9c08f0def30b080f15f6dca67f
@@ -89,7 +89,7 @@ void msn_httpconn_destroy(MsnHttpConn *h
  *
  * @return The number of bytes written.
  */
-ssize_t msn_httpconn_write(MsnHttpConn *httpconn, const char *data, size_t data_len);
+gssize msn_httpconn_write(MsnHttpConn *httpconn, const char *data, size_t data_len);
 
 /**
  * Connects the HTTP connection object to a host.
============================================================
--- libpurple/protocols/msn/servconn.c	1f28b0ee395cb9f54d4dba2507d03d7b4846a49f
+++ libpurple/protocols/msn/servconn.c	7ae41b5b73ab3db9de909c1f10723bd95d3ef53a
@@ -323,10 +323,10 @@ servconn_write_cb(gpointer data, gint so
 	purple_circ_buffer_mark_read(servconn->tx_buf, ret);
 }
 
-ssize_t
+gssize
 msn_servconn_write(MsnServConn *servconn, const char *buf, size_t len)
 {
-	ssize_t ret = 0;
+	gssize ret = 0;
 
 	g_return_val_if_fail(servconn != NULL, 0);
 
============================================================
--- libpurple/protocols/msn/servconn.h	6aa2668e7125c02c17891e406bc5dc8685b4c7a8
+++ libpurple/protocols/msn/servconn.h	c66a3b2303fdb8f755130d13132b33111e160f73
@@ -157,7 +157,7 @@ void msn_servconn_set_destroy_cb(MsnServ
  * @param buf The data to write.
  * @param size The size of the data.
  */
-ssize_t msn_servconn_write(MsnServConn *servconn, const char *buf,
+gssize msn_servconn_write(MsnServConn *servconn, const char *buf,
 						  size_t size);
 
 /**
============================================================
--- libpurple/protocols/msn/soap2.c	4f776f5dd94626b4cdeb5fb050cc3c52f41ef473
+++ libpurple/protocols/msn/soap2.c	8e0e148ba9fb3cb30eef0df8f3a5cb380a9a4660
@@ -33,7 +33,9 @@
 #include "xmlnode.h"
 
 #include <glib.h>
+#if !defined(_WIN32) || !defined(_WINERROR_)
 #include <error.h>
+#endif
 
 #define SOAP_TIMEOUT (5 * 60)
 


More information about the Commits mailing list