2004-09-20 Tollef Fog Heen <tfheen@raw.no>
authorhallski <hallski>
Mon, 20 Sep 2004 22:26:37 +0000
changeset 96 f3abfc08f3ff
parent 95 5fba3df1a9a8
child 97 6ab437739ff6
2004-09-20 Tollef Fog Heen <tfheen@raw.no> * loudmouth/lm-connection.c: (connection_in_event): Use gsize and not gint, they have different sizes on 64 bit architectures. * loudmouth/lm-ssl.c, loudmouth/lm-internals.h: Adjust prototype of _lm_ssl_read to match.
ChangeLog
loudmouth/lm-connection.c
loudmouth/lm-internals.h
loudmouth/lm-ssl.c
--- a/ChangeLog	Fri Sep 03 09:25:33 2004 +0000
+++ b/ChangeLog	Mon Sep 20 22:26:37 2004 +0000
@@ -1,3 +1,12 @@
+2004-09-20  Tollef Fog Heen  <tfheen@raw.no>
+
+	* loudmouth/lm-connection.c:
+	  (connection_in_event): Use gsize and not gint, they have
+          different sizes on 64 bit architectures.
+
+	* loudmouth/lm-ssl.c, loudmouth/lm-internals.h:
+          Adjust prototype of _lm_ssl_read to match.
+
 2004-09-03  Mikael Hallendal  <micke@imendio.com>
 
 	* examples/Makefile.am:
--- a/loudmouth/lm-connection.c	Fri Sep 03 09:25:33 2004 +0000
+++ b/loudmouth/lm-connection.c	Mon Sep 20 22:26:37 2004 +0000
@@ -681,7 +681,7 @@
 		     LmConnection *connection)
 {
 	gchar     buf[IN_BUFFER_SIZE];
-	gint      bytes_read;
+	gsize      bytes_read;
 	GIOStatus status;
        
 	if (!connection->io_channel) {
--- a/loudmouth/lm-internals.h	Fri Sep 03 09:25:33 2004 +0000
+++ b/loudmouth/lm-internals.h	Mon Sep 20 22:26:37 2004 +0000
@@ -74,7 +74,7 @@
 GIOStatus        _lm_ssl_read                       (LmSSL            *ssl,
 						     gchar            *buf,
 						     gint              len,
-						     gint             *bytes_read);
+						     gsize             *bytes_read);
 gboolean         _lm_ssl_send                       (LmSSL            *ssl,
 						     const gchar      *str,
 						     gint              len);
--- a/loudmouth/lm-ssl.c	Fri Sep 03 09:25:33 2004 +0000
+++ b/loudmouth/lm-ssl.c	Mon Sep 20 22:26:37 2004 +0000
@@ -201,7 +201,7 @@
 }
 
 GIOStatus
-_lm_ssl_read (LmSSL *ssl, gchar *buf, gint len, gint *bytes_read)
+_lm_ssl_read (LmSSL *ssl, gchar *buf, gint len, gsize *bytes_read)
 {
 	GIOStatus status;
 	
@@ -388,7 +388,7 @@
 _lm_ssl_read (LmSSL *ssl,
 	      gchar *buf,
 	      gint   len,
-	      gint  *bytes_read)
+	      gsize  *bytes_read)
 {
 	/* NOOP */
 	*bytes_read = 0;