--- sourceforge.net/trunk/rdesktop/rdesktop.c	2003/07/28 21:41:12	437
+++ sourceforge.net/trunk/rdesktop/rdesktop.c	2003/08/01 17:01:58	438
@@ -49,18 +49,18 @@
 				   be fetched from _NET_WORKAREA */
 int height = 600;
 int tcp_port_rdp = TCP_PORT_RDP;
-int server_bpp = 8;
+int g_server_bpp = 8;
 int win_button_size = 0;	/* If zero, disable single app mode */
 BOOL g_bitmap_compression = True;
 BOOL sendmotion = True;
 BOOL g_orders = True;
 BOOL g_encryption = True;
 BOOL packet_encryption = True;
-BOOL desktop_save = True;
+BOOL g_desktop_save = True;
 BOOL fullscreen = False;
 BOOL grab_keyboard = True;
 BOOL hide_decorations = False;
-BOOL use_rdp5 = False;
+BOOL g_use_rdp5 = False;
 extern BOOL owncolmap;
 
 #ifdef RDP2VNC
@@ -298,9 +298,9 @@
 				break;
 
 			case 'a':
-				server_bpp = strtol(optarg, NULL, 10);
-				if (server_bpp != 8 && server_bpp != 16 && server_bpp != 15
-				    && server_bpp != 24)
+				g_server_bpp = strtol(optarg, NULL, 10);
+				if (g_server_bpp != 8 && g_server_bpp != 16 && g_server_bpp != 15
+				    && g_server_bpp != 24)
 				{
 					error("invalid server bpp\n");
 					return 1;
@@ -308,7 +308,7 @@
 				break;
 
 			case '5':
-				use_rdp5 = True;
+				g_use_rdp5 = True;
 				break;
 			case 'h':
 			case '?':