--- sourceforge.net/trunk/rdesktop/rdesktop.c	2003/02/04 05:32:13	309
+++ sourceforge.net/trunk/rdesktop/rdesktop.c	2003/02/11 11:31:04	325
@@ -21,12 +21,12 @@
 #include <stdarg.h>		/* va_list va_start va_end */
 #include <unistd.h>		/* read close getuid getgid getpid getppid gethostname */
 #include <fcntl.h>		/* open */
-#include <errno.h>		/* save licence uses it. */
 #include <pwd.h>		/* getpwuid */
 #include <termios.h>		/* tcgetattr tcsetattr */
 #include <sys/stat.h>		/* stat */
 #include <sys/time.h>		/* gettimeofday */
 #include <sys/times.h>		/* times */
+#include <errno.h>
 #include "rdesktop.h"
 
 #ifdef EGD_SOCKET
@@ -243,7 +243,8 @@
 
 			case 'a':
 				server_bpp = strtol(optarg, NULL, 10);
-				if (server_bpp != 8 && server_bpp != 16)
+				if (server_bpp != 8 && server_bpp != 16 && server_bpp != 15
+				    && server_bpp != 24)
 				{
 					error("invalid server bpp\n");
 					return 1;
@@ -514,7 +515,7 @@
 	}
 }
 
-#ifdef SAVE_LICENCE
+
 int
 load_licence(unsigned char **data)
 {
@@ -572,8 +573,8 @@
 		if ((s_ptr->p) + 4 > data + length)
 		{
 			printf("Error in parsing licence key.\n");
-			printf("Strings %d end value %x > supplied length (%x)\n",
-			       i, s_ptr->p, data + length);
+			printf("Strings %d end value %x > supplied length (%x)\n", i,
+			       (unsigned int) s_ptr->p, (unsigned int) data + length);
 			return;
 		}
 	}
@@ -581,7 +582,8 @@
 	if (s_ptr->p + len > data + length)
 	{
 		printf("Error in parsing licence key.\n");
-		printf("End of licence %x > supplied length (%x)\n", s_ptr->p + len, data + length);
+		printf("End of licence %x > supplied length (%x)\n",
+		       (unsigned int) s_ptr->p + len, (unsigned int) data + length);
 		return;
 	}
 
@@ -617,7 +619,7 @@
 	fnamewrk = xmalloc(strlen(fname) + 12);
 	for (y = 0;; y++)
 	{
-		sprintf(fnamewrk, "%s.%lu", fname, y);
+		sprintf(fnamewrk, "%s.%lu", fname, (long unsigned int) y);
 		fnwrkfd = open(fnamewrk, O_WRONLY | O_CREAT | O_EXCL, 0600);
 		if (fnwrkfd == -1)
 		{
@@ -670,4 +672,3 @@
 	}
 
 }
-#endif