CVS: rdesktop configure.ac,1.9,1.10 rdesktop.c,1.121,1.122 rdp.c,1.77,1.78

Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28958

Modified Files:
	configure.ac rdesktop.c rdp.c 
Log Message:
configure test for HAVE_ICONV_H, HAVE_LOCALE_H and HAVE_LANGINFO_H
still no test for HAVE_ICONV


Index: configure.ac
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/configure.ac,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** configure.ac	8 Mar 2005 03:45:39 -0000	1.9
--- configure.ac	13 Mar 2005 13:36:03 -0000	1.10
***************
*** 21,24 ****
--- 21,27 ----
  AC_CHECK_HEADER(sys/filio.h, AC_DEFINE(HAVE_SYS_FILIO_H))
  AC_CHECK_HEADER(sys/strtio.h, AC_DEFINE(HAVE_SYS_STRTIO_H))
+ AC_CHECK_HEADER(locale.h, AC_DEFINE(HAVE_LOCALE_H))
+ AC_CHECK_HEADER(langinfo.h, AC_DEFINE(HAVE_LANGINFO_H))
+ AC_CHECK_HEADER(iconv.h, AC_DEFINE(HAVE_ICONV_H))
  
  rpath=""

Index: rdesktop.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdesktop.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** rdesktop.c	13 Mar 2005 13:18:48 -0000	1.121
--- rdesktop.c	13 Mar 2005 13:36:03 -0000	1.122
***************
*** 32,38 ****
--- 32,42 ----
  
  #ifdef HAVE_ICONV
+ #ifdef HAVE_LOCALE_H
  #include <locale.h>
+ #endif
+ #ifdef HAVE_LANGINFO_H
  #include <langinfo.h>
  #endif
+ #endif
  
  #ifdef EGD_SOCKET

Index: rdp.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdp.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** rdp.c	13 Mar 2005 13:18:48 -0000	1.77
--- rdp.c	13 Mar 2005 13:36:03 -0000	1.78
***************
*** 24,30 ****
--- 24,32 ----
  #include "rdesktop.h"
  
+ #ifdef HAVE_ICONV
  #ifdef HAVE_ICONV_H
  #include <iconv.h>
  #endif
+ #endif
  
  extern uint16 g_mcs_userid;
***************
*** 149,157 ****
  rdp_out_unistr(STREAM s, char *string, int len)
  {
! #ifdef	HAVE_ICONV
  	size_t ibl = strlen(string), obl = len + 2;
  	static iconv_t iconv_h = (iconv_t)-1;
  	char   *pin = string, *pout;
! #ifdef	B_ENDIAN
  	char ss[4096];	// FIXME: global MAX_BUF_SIZE macro need
  
--- 151,159 ----
  rdp_out_unistr(STREAM s, char *string, int len)
  {
! #ifdef HAVE_ICONV
  	size_t ibl = strlen(string), obl = len + 2;
  	static iconv_t iconv_h = (iconv_t)-1;
  	char   *pin = string, *pout;
! #ifdef B_ENDIAN
  	char ss[4096];	// FIXME: global MAX_BUF_SIZE macro need
  
***************
*** 190,194 ****
  	}
  
! #ifdef	B_ENDIAN
  	swab(ss, s->p, len + 4);
  #endif
--- 192,196 ----
  	}
  
! #ifdef B_ENDIAN
  	swab(ss, s->p, len + 4);
  #endif
***************
*** 218,226 ****
  rdp_in_unistr(STREAM s, char *string, int uni_len)
  {
! #ifdef	HAVE_ICONV
  	size_t ibl = uni_len, obl = uni_len;
  	char *pin, *pout = string;
  	static iconv_t iconv_h = (iconv_t)-1;
! #ifdef	B_ENDIAN
  	char ss[4096];	// FIXME: global MAX_BUF_SIZE macro need
  
--- 220,228 ----
  rdp_in_unistr(STREAM s, char *string, int uni_len)
  {
! #ifdef HAVE_ICONV
  	size_t ibl = uni_len, obl = uni_len;
  	char *pin, *pout = string;
  	static iconv_t iconv_h = (iconv_t)-1;
! #ifdef B_ENDIAN
  	char ss[4096];	// FIXME: global MAX_BUF_SIZE macro need
  



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click