--- sourceforge.net/trunk/rdesktop/rdesktop.c	2005/03/23 12:25:54	867
+++ sourceforge.net/trunk/rdesktop/rdesktop.c	2005/04/16 11:42:34	886
@@ -40,6 +40,7 @@
 #endif
 
 #ifdef EGD_SOCKET
+#include <sys/types.h>
 #include <sys/socket.h>		/* socket connect */
 #include <sys/un.h>		/* sockaddr_un */
 #endif
@@ -84,6 +85,7 @@
 BOOL g_numlock_sync = False;
 BOOL g_owncolmap = False;
 BOOL g_ownbackstore = True;	/* We can't rely on external BackingStore */
+BOOL g_rdp_compression = False;
 uint32 g_embed_wnd;
 uint32 g_rdp5_performanceflags =
 	RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG | RDP5_NO_MENUANIMATIONS;
@@ -558,7 +560,7 @@
 				break;
 
 			case 'X':
-				g_embed_wnd = strtol(optarg, NULL, 10);
+				g_embed_wnd = strtol(optarg, NULL, 0);
 				break;
 
 			case 'a':
@@ -574,6 +576,7 @@
 			case 'z':
 				DEBUG(("rdp compression enabled\n"));
 				flags |= RDP_COMPRESSION;
+				g_rdp_compression = True;
 				break;
 
 			case 'x':
@@ -739,12 +742,6 @@
 		STRNCPY(g_hostname, fullhostname, sizeof(g_hostname));
 	}
 
-	if ((flags & RDP_COMPRESSION) && (g_server_bpp > 8))
-	{
-		warning("rdp compression not supported for bpp > 8, compression disabled\n");
-		flags ^= RDP_COMPRESSION;
-	}
-
 	if (prompt_password && read_password(password, sizeof(password)))
 		flags |= RDP_LOGON_AUTO;