/[rdesktop]/sourceforge.net/trunk/rdesktop/rdp.c
This is repository of my old source code which isn't updated any more. Go to git.rot13.org for current projects!
ViewVC logotype

Diff of /sourceforge.net/trunk/rdesktop/rdp.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 857 by stargo, Sun Mar 13 13:36:04 2005 UTC revision 858 by stargo, Sun Mar 13 13:58:23 2005 UTC
# Line 27  Line 27 
27  #ifdef HAVE_ICONV_H  #ifdef HAVE_ICONV_H
28  #include <iconv.h>  #include <iconv.h>
29  #endif  #endif
30    
31    #ifndef ICONV_CONST
32    #define ICONV_CONST ""
33    #endif
34  #endif  #endif
35    
36  extern uint16 g_mcs_userid;  extern uint16 g_mcs_userid;
# Line 173  rdp_out_unistr(STREAM s, char *string, i Line 177  rdp_out_unistr(STREAM s, char *string, i
177                                  g_codepage, WINDOWS_CODEPAGE, (int)iconv_h);                                  g_codepage, WINDOWS_CODEPAGE, (int)iconv_h);
178                          return;                          return;
179                  }                  }
180                  if (iconv(iconv_h, (const char**)&pin, &i, &pout, &o) == (size_t)-1)                  if (iconv(iconv_h, (ICONV_CONST char**)&pin, &i, &pout, &o) == (size_t)-1)
181                  {                  {
182                          iconv_close(iconv_h);                          iconv_close(iconv_h);
183                          iconv_h = (iconv_t)-1;                          iconv_h = (iconv_t)-1;
# Line 183  rdp_out_unistr(STREAM s, char *string, i Line 187  rdp_out_unistr(STREAM s, char *string, i
187                  pin = string; pout = s->p;                  pin = string; pout = s->p;
188          }          }
189    
190          if (iconv(iconv_h, (const char**)&pin, &ibl, &pout, &obl) == (size_t)-1)          if (iconv(iconv_h, (ICONV_CONST char**)&pin, &ibl, &pout, &obl) == (size_t)-1)
191          {          {
192                  iconv_close(iconv_h);                  iconv_close(iconv_h);
193                  iconv_h = (iconv_t)-1;                  iconv_h = (iconv_t)-1;
# Line 242  rdp_in_unistr(STREAM s, char *string, in Line 246  rdp_in_unistr(STREAM s, char *string, in
246                  }                  }
247          }          }
248    
249          if (iconv(iconv_h, (const char**)&pin, &ibl, &pout, &obl) == (size_t)-1)          if (iconv(iconv_h, (ICONV_CONST char**)&pin, &ibl, &pout, &obl) == (size_t)-1)
250          {          {
251                  iconv_close(iconv_h);                  iconv_close(iconv_h);
252                  iconv_h = (iconv_t)-1;                  iconv_h = (iconv_t)-1;
Legend:
Removed from v.857  
changed lines
  Added in v.858
  ViewVC Help
Powered by ViewVC 1.1.26