aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/os/io.c
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-02-18 10:24:21 +0100
committerMihai Moldovan <ionic@ionic.de>2017-02-18 10:24:21 +0100
commit73ec915bcb1c6bde73168ad1ee1cccbec3455569 (patch)
tree65241ce35eeee929f9a5d6033b493b0ec165a074 /nx-X11/programs/Xserver/os/io.c
parent0a7df07702c6f56b708a22c666077a3b90c7542c (diff)
parent6884e6a5b0cabdce39005470f4bcd0d960cfc956 (diff)
downloadnx-libs-73ec915bcb1c6bde73168ad1ee1cccbec3455569.tar.gz
nx-libs-73ec915bcb1c6bde73168ad1ee1cccbec3455569.tar.bz2
nx-libs-73ec915bcb1c6bde73168ad1ee1cccbec3455569.zip
Merge branch 'sunweaver-pr/smart-scheduler-is-not-optional' into 3.6.x
Attributes GH PR #330: https://github.com/ArcticaProject/nx-libs/pull/330
Diffstat (limited to 'nx-X11/programs/Xserver/os/io.c')
-rw-r--r--nx-X11/programs/Xserver/os/io.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/os/io.c b/nx-X11/programs/Xserver/os/io.c
index 3771d40fb..87739cfb1 100644
--- a/nx-X11/programs/Xserver/os/io.c
+++ b/nx-X11/programs/Xserver/os/io.c
@@ -430,11 +430,9 @@ ReadRequestFromClient(ClientPtr client)
FD_SET(fd, &ClientsWithInput);
else
{
-#ifdef SMART_SCHEDULE
if (!SmartScheduleDisable)
FD_CLR(fd, &ClientsWithInput);
else
-#endif
YieldControlNoInput();
}
}
@@ -442,16 +440,12 @@ ReadRequestFromClient(ClientPtr client)
{
if (!gotnow)
AvailableInput = oc;
-#ifdef SMART_SCHEDULE
if (!SmartScheduleDisable)
FD_CLR(fd, &ClientsWithInput);
else
-#endif
YieldControlNoInput();
}
-#ifdef SMART_SCHEDULE
if (SmartScheduleDisable)
-#endif
if (++timesThisConnection >= MAX_TIMES_PER)
YieldControl();
#ifdef BIGREQS