xserver: Branch 'master'

[Adam Jackson]

 os/io.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 40f9b6bf0dc62098680235a958e0733770902cca
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Oct 23 17:33:52 2008 -0400

    Argh, macros.

diff --git a/os/io.c b/os/io.c
index e25a79c..f07993e 100644
--- a/os/io.c
+++ b/os/io.c
@@ -179,7 +179,7 @@ YieldControl(void)
 }
 
 static void
-YieldControlNoInput(void)
+YieldControlNoInput(int fd)
 {
     YieldControl();
     FD_CLR(fd, &ClientsWithInput);
@@ -346,7 +346,7 @@ ReadRequestFromClient(ClientPtr client)
 		if (0)
 #endif
 		{
-		    YieldControlNoInput();
+		    YieldControlNoInput(fd);
 		    return 0;
 		}
 	    }
@@ -388,7 +388,7 @@ ReadRequestFromClient(ClientPtr client)
 	if (gotnow < needed)
 	{
 	    /* Still don't have enough; punt. */
-	    YieldControlNoInput();
+	    YieldControlNoInput(fd);
 	    return 0;
 	}
     }
@@ -425,7 +425,7 @@ ReadRequestFromClient(ClientPtr client)
 	    if (!SmartScheduleDisable)
 		FD_CLR(fd, &ClientsWithInput);
 	    else
-		YieldControlNoInput();
+		YieldControlNoInput(fd);
 	}
     }
     else
@@ -435,7 +435,7 @@ ReadRequestFromClient(ClientPtr client)
 	if (!SmartScheduleDisable)
 	    FD_CLR(fd, &ClientsWithInput);
 	else
-	    YieldControlNoInput();
+	    YieldControlNoInput(fd);
     }
     if (SmartScheduleDisable)
     if (++timesThisConnection >= MAX_TIMES_PER)
@@ -529,7 +529,7 @@ InsertFakeRequest(ClientPtr client, char *data, int count)
 	(gotnow >= (int)(get_req_len((xReq *)oci->bufptr, client) << 2)))
 	FD_SET(fd, &ClientsWithInput);
     else
-	YieldControlNoInput();
+	YieldControlNoInput(fd);
     return(TRUE);
 }
 
@@ -553,7 +553,7 @@ ResetCurrentRequest(ClientPtr client)
     gotnow = oci->bufcnt + oci->buffer - oci->bufptr;
     if (gotnow < sizeof(xReq))
     {
-	YieldControlNoInput();
+	YieldControlNoInput(fd);
     }
     else
     {
@@ -583,7 +583,7 @@ ResetCurrentRequest(ClientPtr client)
 	    YieldControl();
 	}
 	else
-	    YieldControlNoInput();
+	    YieldControlNoInput(fd);
     }
 }