aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Args.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/hw/nxagent/Args.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/hw/nxagent/Args.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Args.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index 46e01c737..3844fe046 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -2538,26 +2538,10 @@ void nxagentSetBufferSize()
void nxagentSetScheduler()
{
- #ifdef DISABLE_SMART_SCHEDULE
-
- #ifdef SMART_SCHEDULE
-
- #ifdef TEST
- fprintf(stderr, "nxagentSetScheduler: Disabling the smart scheduler.\n");
- #endif
-
- nxagentDisableTimer();
-
- #endif
-
- #else /* #ifdef DISABLE_SMART_SCHEDULE */
-
/*
* The smart scheduler is the default.
*/
- #ifdef SMART_SCHEDULE
-
if (nxagentOption(Shadow) == 1)
{
#ifdef TEST
@@ -2566,10 +2550,6 @@ void nxagentSetScheduler()
nxagentDisableTimer();
}
-
- #endif
-
- #endif /* #ifdef DISABLE_SMART_SCHEDULE */
}
void nxagentSetCoalescence()