CVS: rdesktop channels.c,1.11,1.12 mppc.c,1.3,1.4 rdp.c,1.61,1.62 rdp5.c,1.9,1.10

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

Modified Files:
	channels.c mppc.c rdp.c rdp5.c 
Log Message:
changes to compile with g++

Index: channels.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/channels.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** channels.c	31 Oct 2003 04:29:56 -0000	1.11
--- channels.c	15 Jun 2004 22:45:12 -0000	1.12
***************
*** 162,166 ****
  			if (length > in->size)
  			{
! 				in->data = xrealloc(in->data, length);
  				in->size = length;
  			}
--- 162,166 ----
  			if (length > in->size)
  			{
! 				in->data = (uint8*)xrealloc(in->data, length);
  				in->size = length;
  			}

Index: mppc.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/mppc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mppc.c	4 May 2004 09:48:45 -0000	1.3
--- mppc.c	15 Jun 2004 22:45:12 -0000	1.4
***************
*** 65,69 ****
  	int old_offset, match_bits;
  
! 	signed char *dict = &(g_mppc_dict.hist);
  
  	if ((ctype & RDP_MPPC_COMPRESSED) == 0)
--- 65,69 ----
  	int old_offset, match_bits;
  
! 	uint8 *dict = g_mppc_dict.hist;
  
  	if ((ctype & RDP_MPPC_COMPRESSED) == 0)
***************
*** 280,284 ****
  			match_bits = match_len;
  			match_len =
! 				walker >> 32 - match_bits & ~(-1 << match_bits) | 1 << match_bits;
  			walker <<= match_bits;
  			walker_len -= match_bits;
--- 280,284 ----
  			match_bits = match_len;
  			match_len =
! 				((walker >> (32 - match_bits)) & (~(-1 << match_bits))) | (1 << match_bits);
  			walker <<= match_bits;
  			walker_len -= match_bits;
***************
*** 289,293 ****
  		}
  		/* memory areas can overlap - meaning we can't use memXXX functions */
! 		k = next_offset - match_off & (RDP_MPPC_DICT_SIZE - 1);
  		do
  		{
--- 289,293 ----
  		}
  		/* memory areas can overlap - meaning we can't use memXXX functions */
! 		k = (next_offset - match_off) & (RDP_MPPC_DICT_SIZE - 1);
  		do
  		{

Index: rdp.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdp.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** rdp.c	4 Jun 2004 15:01:35 -0000	1.61
--- rdp.c	15 Jun 2004 22:45:12 -0000	1.62
***************
*** 989,993 ****
  
  		/* allocate memory and copy the uncompressed data into the temporary stream */
! 		ns->data = xrealloc(ns->data, rlen);
  
  		memcpy((ns->data), (unsigned char *) (g_mppc_dict.hist + roff), rlen);
--- 989,993 ----
  
  		/* allocate memory and copy the uncompressed data into the temporary stream */
! 		ns->data = (uint8 *) xrealloc(ns->data, rlen);
  
  		memcpy((ns->data), (unsigned char *) (g_mppc_dict.hist + roff), rlen);

Index: rdp5.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdp5.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** rdp5.c	30 Apr 2004 06:18:08 -0000	1.9
--- rdp5.c	15 Jun 2004 22:45:12 -0000	1.10
***************
*** 71,75 ****
  
  			/* allocate memory and copy the uncompressed data into the temporary stream */
! 			ns->data = xrealloc(ns->data, rlen);
  
  			memcpy((ns->data), (unsigned char *) (g_mppc_dict.hist + roff), rlen);
--- 71,75 ----
  
  			/* allocate memory and copy the uncompressed data into the temporary stream */
! 			ns->data = (uint8 *) xrealloc(ns->data, rlen);
  
  			memcpy((ns->data), (unsigned char *) (g_mppc_dict.hist + roff), rlen);



-------------------------------------------------------
This SF.Net email is sponsored by The 2004 JavaOne(SM) Conference
Learn from the experts at JavaOne(SM), Sun's Worldwide Java Developer
Conference, June 28 - July 1 at the Moscone Center in San Francisco, CA
REGISTER AND SAVE! http://java.sun.com/javaone/sf Priority Code NWMGYKND