From: <mar...@us...> - 2006-10-23 20:22:10
|
Revision: 17569 http://svn.sourceforge.net/gaim/?rev=17569&view=rev Author: markhuetsch Date: 2006-10-23 13:21:54 -0700 (Mon, 23 Oct 2006) Log Message: ----------- Let qq compile on Solaris. Patch thanks to Torrey McMahon (tmcmahon2) and Taso N. Devetzis (devetzis). Modified Paths: -------------- trunk/libgaim/protocols/qq/file_trans.c trunk/libgaim/protocols/qq/send_file.c trunk/libgaim/protocols/qq/send_file.h Modified: trunk/libgaim/protocols/qq/file_trans.c =================================================================== --- trunk/libgaim/protocols/qq/file_trans.c 2006-10-23 19:43:45 UTC (rev 17568) +++ trunk/libgaim/protocols/qq/file_trans.c 2006-10-23 20:21:54 UTC (rev 17569) @@ -218,8 +218,8 @@ static int _qq_xfer_open_file(const gchar *filename, const gchar *method, GaimXfer *xfer) { ft_info *info = xfer->data; - info->dest_fp = fopen(gaim_xfer_get_local_filename(xfer), method); - if (info->dest_fp == NULL) { + info->u.dest_fp = fopen(gaim_xfer_get_local_filename(xfer), method); + if (info->u.dest_fp == NULL) { return -1; } return 0; @@ -229,22 +229,22 @@ { ft_info *info = xfer->data; - fseek(info->dest_fp, index * len, SEEK_SET); - return fread(buffer, 1, len, info->dest_fp); + fseek(info->u.dest_fp, index * len, SEEK_SET); + return fread(buffer, 1, len, info->u.dest_fp); } static gint _qq_xfer_write_file(guint8 *buffer, guint index, guint len, GaimXfer *xfer) { ft_info *info = xfer->data; - fseek(info->dest_fp, index * len, SEEK_SET); - return fwrite(buffer, 1, len, info->dest_fp); + fseek(info->u.dest_fp, index * len, SEEK_SET); + return fwrite(buffer, 1, len, info->u.dest_fp); } void qq_xfer_close_file(GaimXfer *xfer) { ft_info *info = xfer->data; - if (info->dest_fp) fclose(info->dest_fp); + if (info->u.dest_fp) fclose(info->u.dest_fp); } #endif Modified: trunk/libgaim/protocols/qq/send_file.c =================================================================== --- trunk/libgaim/protocols/qq/send_file.c 2006-10-23 19:43:45 UTC (rev 17568) +++ trunk/libgaim/protocols/qq/send_file.c 2006-10-23 20:21:54 UTC (rev 17569) @@ -204,8 +204,8 @@ info = (ft_info *) xfer->data; qq_xfer_close_file(xfer); - if (info->dest_fp != NULL) { - fclose(info->dest_fp); + if (info->u.dest_fp != NULL) { + fclose(info->u.dest_fp); gaim_debug(GAIM_DEBUG_INFO, "QQ", "file closed\n"); } if (info->major_fd != 0) { Modified: trunk/libgaim/protocols/qq/send_file.h =================================================================== --- trunk/libgaim/protocols/qq/send_file.h 2006-10-23 19:43:45 UTC (rev 17568) +++ trunk/libgaim/protocols/qq/send_file.h 2006-10-23 20:21:54 UTC (rev 17569) @@ -40,7 +40,7 @@ union { FILE *dest_fp; guint8 *buffer; - }; + } u; gboolean use_major; } ft_info; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |