--- sourceforge.net/trunk/rdesktop/rdp.c	2003/05/05 12:20:53	371
+++ sourceforge.net/trunk/rdesktop/rdp.c	2003/05/30 21:59:56	381
@@ -20,7 +20,7 @@
 
 #include "rdesktop.h"
 
-extern uint16 mcs_userid;
+extern uint16 g_mcs_userid;
 extern char username[16];
 extern BOOL bitmap_compression;
 extern BOOL orders;
@@ -100,7 +100,7 @@
 
 	out_uint16_le(s, length);
 	out_uint16_le(s, (RDP_PDU_DATA | 0x10));
-	out_uint16_le(s, (mcs_userid + 1001));
+	out_uint16_le(s, (g_mcs_userid + 1001));
 
 	out_uint32_le(s, rdp_shareid);
 	out_uint8(s, 0);	/* pad */
@@ -236,7 +236,7 @@
 			rdp_out_unistr(s, directory, len_directory);
 		} else {
 			out_uint16_le(s, 0);
-		} 
+		}
 		out_uint16_le(s, 2);
 		out_uint16_le(s, len_ip+2); // Length of client ip
 		rdp_out_unistr(s, "127.0.0.1", len_ip);
@@ -552,7 +552,7 @@
 
 	out_uint16_le(s, 2 + 14 + caplen + sizeof(RDP_SOURCE));
 	out_uint16_le(s, (RDP_PDU_CONFIRM_ACTIVE | 0x10));	/* Version 1 */
-	out_uint16_le(s, (mcs_userid + 1001));
+	out_uint16_le(s, (g_mcs_userid + 1001));
 
 	out_uint32_le(s, rdp_shareid);
 	out_uint16_le(s, 0x3ea);	/* userid */
@@ -710,7 +710,7 @@
 		if (!compress)
 		{
 			int y;
-			bmpdata = xmalloc(width * height * Bpp);
+			bmpdata = (uint8*)xmalloc(width * height * Bpp);
 			for (y = 0; y < height; y++)
 			{
 				in_uint8a(s, &bmpdata[(height - y - 1) * (width * Bpp)],
@@ -733,7 +733,7 @@
 			in_uint8s(s, 4);	/* line_size, final_size */
 		}
 		in_uint8p(s, data, size);
-		bmpdata = xmalloc(width * height * Bpp);
+		bmpdata = (uint8*)xmalloc(width * height * Bpp);
 		if (bitmap_decompress(bmpdata, width, height, data, size, Bpp))
 		{
 			ui_paint_bitmap(left, top, cx, cy, width, height, bmpdata);
@@ -760,7 +760,7 @@
 	in_uint16_le(s, map.ncolours);
 	in_uint8s(s, 2);	/* pad */
 
-	map.colours = xmalloc(3 * map.ncolours);
+	map.colours = (COLOURENTRY*)xmalloc(3 * map.ncolours);
 
 	DEBUG(("PALETTE(c=%d)\n", map.ncolours));