changeset 22915:84807b5e60fa

Build fixes for MSVC
author Daniel Atallah <daniel.atallah@gmail.com>
date Mon, 12 May 2008 02:24:20 +0000
parents ada1640fa260
children 8f353a311895
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
diffstat 5 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/msn/httpconn.c	Mon May 12 02:21:52 2008 +0000
+++ b/libpurple/protocols/msn/httpconn.c	Mon May 12 02:24:20 2008 +0000
@@ -438,7 +438,7 @@
 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 @@
 	return TRUE;
 }
 
-ssize_t
+gssize
 msn_httpconn_write(MsnHttpConn *httpconn, const char *body, size_t body_len)
 {
 	char *params;
--- a/libpurple/protocols/msn/httpconn.h	Mon May 12 02:21:52 2008 +0000
+++ b/libpurple/protocols/msn/httpconn.h	Mon May 12 02:24:20 2008 +0000
@@ -89,7 +89,7 @@
  *
  * @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.
--- a/libpurple/protocols/msn/servconn.c	Mon May 12 02:21:52 2008 +0000
+++ b/libpurple/protocols/msn/servconn.c	Mon May 12 02:24:20 2008 +0000
@@ -323,10 +323,10 @@
 	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);
 
--- a/libpurple/protocols/msn/servconn.h	Mon May 12 02:21:52 2008 +0000
+++ b/libpurple/protocols/msn/servconn.h	Mon May 12 02:24:20 2008 +0000
@@ -157,7 +157,7 @@
  * @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);
 
 /**
--- a/libpurple/protocols/msn/soap2.c	Mon May 12 02:21:52 2008 +0000
+++ b/libpurple/protocols/msn/soap2.c	Mon May 12 02:24:20 2008 +0000
@@ -33,7 +33,9 @@
 #include "xmlnode.h"
 
 #include <glib.h>
+#if !defined(_WIN32) || !defined(_WINERROR_)
 #include <error.h>
+#endif
 
 #define SOAP_TIMEOUT (5 * 60)