Index: os/WaitFor.c
===================================================================
RCS file: /cvs/xorg/xserver/xorg/os/WaitFor.c,v
retrieving revision 1.16
diff -u -3 -d -p -b -u -r1.16 WaitFor.c
--- os/WaitFor.c	2 May 2006 01:30:37 -0000	1.16
+++ os/WaitFor.c	22 May 2006 21:48:46 -0000
@@ -354,20 +354,12 @@ WaitForSomething(int *pClientsReady)
 #endif
 	    if (XFD_ANYSET (&devicesReadable) || XFD_ANYSET (&clientsReadable))
 		break;
-#ifdef WIN32
-	    /* Windows keyboard and mouse events are added to the input queue
-	       in Block- and WakupHandlers. There is no device to check if  
-	       data is ready. So check here if new input is available */
-	    if (*checkForInput[0] != *checkForInput[1])
-		return 0;
-#endif
 	}
     }
 
     nready = 0;
     if (XFD_ANYSET (&clientsReadable))
     {
-#ifndef WIN32
 	for (i=0; i<howmany(XFD_SETSIZE, NFDBITS); i++)
 	{
 	    int highest_priority = 0;
@@ -379,17 +371,6 @@ WaitForSomething(int *pClientsReady)
 		curclient = ffs (clientsReadable.fds_bits[i]) - 1;
 		client_index = /* raphael: modified */
 			ConnectionTranslation[curclient + (i * (sizeof(fd_mask) * 8))];
-#else
-	int highest_priority = 0;
-	fd_set savedClientsReadable;
-	XFD_COPYSET(&clientsReadable, &savedClientsReadable);
-	for (i = 0; i < XFD_SETCOUNT(&savedClientsReadable); i++)
-	{
-	    int client_priority, client_index;
-
-	    curclient = XFD_FD(&savedClientsReadable, i);
-	    client_index = GetConnectionTranslation(curclient);
-#endif
 #ifdef XSYNC
 		/*  We implement "strict" priorities.
 		 *  Only the highest priority client is returned to