andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Argh, macros.

Browse Source
This commit is contained in:
Adam Jackson 2008-10-23 17:33:52 -04:00
parent 8b3c278fe7
commit 40f9b6bf0d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
os/io.c
View File

@ -179,7 +179,7 @@ YieldControl(void)
} }
static void static void
YieldControlNoInput(void) YieldControlNoInput(int fd)
{ {
YieldControl(); YieldControl();
FD_CLR(fd, &ClientsWithInput); FD_CLR(fd, &ClientsWithInput);
@ -346,7 +346,7 @@ ReadRequestFromClient(ClientPtr client)
if (0) if (0)
#endif #endif
{ {
YieldControlNoInput(); YieldControlNoInput(fd);
return 0; return 0;
} }
} }
@ -388,7 +388,7 @@ ReadRequestFromClient(ClientPtr client)
if (gotnow < needed) if (gotnow < needed)
{ {
/* Still don't have enough; punt. */ /* Still don't have enough; punt. */
YieldControlNoInput(); YieldControlNoInput(fd);
return 0; return 0;
} }
} }
@ -425,7 +425,7 @@ ReadRequestFromClient(ClientPtr client)
if (!SmartScheduleDisable) if (!SmartScheduleDisable)
FD_CLR(fd, &ClientsWithInput); FD_CLR(fd, &ClientsWithInput);
else else
YieldControlNoInput(); YieldControlNoInput(fd);
} }
} }
else else
@ -435,7 +435,7 @@ ReadRequestFromClient(ClientPtr client)
if (!SmartScheduleDisable) if (!SmartScheduleDisable)
FD_CLR(fd, &ClientsWithInput); FD_CLR(fd, &ClientsWithInput);
else else
YieldControlNoInput(); YieldControlNoInput(fd);
} }
if (SmartScheduleDisable) if (SmartScheduleDisable)
if (++timesThisConnection >= MAX_TIMES_PER) 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))) (gotnow >= (int)(get_req_len((xReq *)oci->bufptr, client) << 2)))
FD_SET(fd, &ClientsWithInput); FD_SET(fd, &ClientsWithInput);
else else
YieldControlNoInput(); YieldControlNoInput(fd);
return(TRUE); return(TRUE);
} }
@ -553,7 +553,7 @@ ResetCurrentRequest(ClientPtr client)
gotnow = oci->bufcnt + oci->buffer - oci->bufptr; gotnow = oci->bufcnt + oci->buffer - oci->bufptr;
if (gotnow < sizeof(xReq)) if (gotnow < sizeof(xReq))
{ {
YieldControlNoInput(); YieldControlNoInput(fd);
} }
else else
{ {
@ -583,7 +583,7 @@ ResetCurrentRequest(ClientPtr client)
YieldControl(); YieldControl();
} }
else else
YieldControlNoInput(); YieldControlNoInput(fd);
} }
} }