Mercurial > pidgin
changeset 13276:d6a799421657
[gaim-migrate @ 15642]
gsize != size_t on weird platforms
committer: Tailor Script <tailor@pidgin.im>
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Mon, 13 Feb 2006 18:14:14 +0000 |
| parents | 4f8c85836b41 |
| children | 2a9580fc922b |
| files | src/protocols/yahoo/yahoo_filexfer.c src/protocols/yahoo/yahoo_packet.c src/protocols/yahoo/yahoo_packet.h src/protocols/yahoo/yahoo_picture.c |
| diffstat | 4 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/yahoo/yahoo_filexfer.c Mon Feb 13 17:33:32 2006 +0000 +++ b/src/protocols/yahoo/yahoo_filexfer.c Mon Feb 13 18:14:14 2006 +0000 @@ -146,7 +146,7 @@ guchar *pkt_buf; const char *host; int port; - gsize content_length, header_len, pkt_buf_len; + size_t content_length, header_len, pkt_buf_len; GaimConnection *gc; GaimAccount *account; struct yahoo_data *yd;
--- a/src/protocols/yahoo/yahoo_packet.c Mon Feb 13 17:33:32 2006 +0000 +++ b/src/protocols/yahoo/yahoo_packet.c Mon Feb 13 18:14:14 2006 +0000 @@ -82,11 +82,11 @@ va_end(ap); } -gsize yahoo_packet_length(struct yahoo_packet *pkt) +size_t yahoo_packet_length(struct yahoo_packet *pkt) { GSList *l; - gsize len = 0; + size_t len = 0; l = pkt->hash; while (l) { @@ -270,11 +270,11 @@ } -gsize yahoo_packet_build(struct yahoo_packet *pkt, int pad, gboolean wm, +size_t yahoo_packet_build(struct yahoo_packet *pkt, int pad, gboolean wm, guchar **buf) { - gsize pktlen = yahoo_packet_length(pkt); - gsize len = YAHOO_PACKET_HDRLEN + pktlen; + size_t pktlen = yahoo_packet_length(pkt); + size_t len = YAHOO_PACKET_HDRLEN + pktlen; guchar *data; int pos = 0; @@ -301,7 +301,7 @@ int yahoo_packet_send(struct yahoo_packet *pkt, struct yahoo_data *yd) { - gsize len; + size_t len; int ret; guchar *data;
--- a/src/protocols/yahoo/yahoo_packet.h Mon Feb 13 17:33:32 2006 +0000 +++ b/src/protocols/yahoo/yahoo_packet.h Mon Feb 13 18:14:14 2006 +0000 @@ -125,12 +125,12 @@ void yahoo_packet_hash_int(struct yahoo_packet *pkt, int key, int value); int yahoo_packet_send(struct yahoo_packet *pkt, struct yahoo_data *yd); int yahoo_packet_send_and_free(struct yahoo_packet *pkt, struct yahoo_data *yd); -gsize yahoo_packet_build(struct yahoo_packet *pkt, int pad, gboolean wm, +size_t yahoo_packet_build(struct yahoo_packet *pkt, int pad, gboolean wm, guchar **buf); void yahoo_packet_read(struct yahoo_packet *pkt, guchar *data, int len); void yahoo_packet_write(struct yahoo_packet *pkt, guchar *data); void yahoo_packet_dump(guchar *data, int len); -gsize yahoo_packet_length(struct yahoo_packet *pkt); +size_t yahoo_packet_length(struct yahoo_packet *pkt); void yahoo_packet_free(struct yahoo_packet *pkt); #endif /* _YAHOO_PACKET_H_ */
--- a/src/protocols/yahoo/yahoo_picture.c Mon Feb 13 17:33:32 2006 +0000 +++ b/src/protocols/yahoo/yahoo_picture.c Mon Feb 13 18:14:14 2006 +0000 @@ -370,7 +370,7 @@ guchar *pkt_buf; const char *host; int port; - gsize content_length, pkt_buf_len; + size_t content_length, pkt_buf_len; GaimConnection *gc; GaimAccount *account; struct yahoo_data *yd;