--- sourceforge.net/trunk/rdesktop/rdpdr.c	2004/02/06 10:32:13	598
+++ sourceforge.net/trunk/rdesktop/rdpdr.c	2004/02/16 20:28:09	609
@@ -1,5 +1,6 @@
 #include <unistd.h>
 #include <sys/types.h>
+#include <sys/time.h>
 #include <time.h>
 #include "rdesktop.h"
 
@@ -81,7 +82,7 @@
 /* Add a new io request to the table containing pending io requests so it won't block rdesktop */
 BOOL
 add_async_iorequest(uint32 device, uint32 file, uint32 id, uint32 major, uint32 length,
-		    DEVICE_FNS * fns, long total_timeout, long interval_timeout, uint8 * buffer)
+		    DEVICE_FNS * fns, uint32 total_timeout, uint32 interval_timeout, uint8 * buffer)
 {
 	struct async_iorequest *iorq;
 
@@ -687,7 +688,7 @@
 void
 rdpdr_add_fds(int *n, fd_set * rfds, fd_set * wfds, struct timeval *tv, BOOL * timeout)
 {
-	long select_timeout = 0;	// Timeout value to be used for select() (in millisecons).
+	uint32 select_timeout = 0;	// Timeout value to be used for select() (in millisecons).
 	struct async_iorequest *iorq;
 
 	iorq = g_iorequest;
@@ -836,8 +837,8 @@
 							status = STATUS_SUCCESS;
 							rdpdr_send_completion(iorq->device,
 									      iorq->id, status,
-									      iorq->partial_len, "",
-									      1);
+									      iorq->partial_len,
+									      (uint8 *) "", 1);
 
 							xfree(iorq->buffer);
 							iorq->fd = 0;
@@ -872,7 +873,7 @@
 	struct async_iorequest *iorq;
 	struct async_iorequest *prev;
 
-	iorq = &g_iorequest;
+	iorq = g_iorequest;
 	prev = NULL;
 	while (iorq != NULL)
 	{
@@ -881,7 +882,8 @@
 		if ((iorq->fd == fd) && (major == 0 || iorq->major == major))
 		{
 			result = 0;
-			rdpdr_send_completion(iorq->device, iorq->id, status, result, "", 1);
+			rdpdr_send_completion(iorq->device, iorq->id, status, result, (uint8 *) "",
+					      1);
 			xfree(iorq->buffer);
 			iorq->fd = 0;
 			if (prev != NULL)