CVS: rdesktop xclip.c,1.26,1.27
Michael Gernoth <[email protected]>
| Newsgroups | gmane.network.rdesktop.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/rdesktop/rdesktop In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31530 Modified Files: xclip.c Log Message: incompatible pointer type warning fixes for iconv-calls Index: xclip.c =================================================================== RCS file: /cvsroot/rdesktop/rdesktop/xclip.c,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** xclip.c 28 Feb 2006 08:09:41 -0000 1.26 --- xclip.c 1 Mar 2006 14:16:41 -0000 1.27 *************** *** 321,326 **** char *data_remaining = (char *) source; size_t data_size_remaining = source_size; ! iconv(cd, &data_remaining, &data_size_remaining, &unicode_buffer_remaining, ! &unicode_buffer_size_remaining); iconv_close(cd); --- 321,326 ---- char *data_remaining = (char *) source; size_t data_size_remaining = source_size; ! iconv(cd, (ICONV_CONST char **) &data_remaining, &data_size_remaining, ! &unicode_buffer_remaining, &unicode_buffer_size_remaining); iconv_close(cd); *************** *** 774,779 **** return; } ! iconv(cd, &data_remaining, &length_remaining, &utf8_data_remaining, ! &utf8_length_remaining); iconv_close(cd); free_data = True; --- 774,779 ---- return; } ! iconv(cd, (ICONV_CONST char **) &data_remaining, &length_remaining, ! &utf8_data_remaining, &utf8_length_remaining); iconv_close(cd); free_data = True; ------------------------------------------------------- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642