diff options
author | Mihai Moldovan <ionic@ionic.de> | 2017-02-18 10:24:21 +0100 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2017-02-18 10:24:21 +0100 |
commit | 73ec915bcb1c6bde73168ad1ee1cccbec3455569 (patch) | |
tree | 65241ce35eeee929f9a5d6033b493b0ec165a074 /nx-X11/programs/Xserver/os/utils.c | |
parent | 0a7df07702c6f56b708a22c666077a3b90c7542c (diff) | |
parent | 6884e6a5b0cabdce39005470f4bcd0d960cfc956 (diff) | |
download | nx-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/utils.c')
-rw-r--r-- | nx-X11/programs/Xserver/os/utils.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index 5f7542a2d..204494d63 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -134,9 +134,7 @@ OR PERFORMANCE OF THIS SOFTWARE. #include "opaque.h" -#ifdef SMART_SCHEDULE #include "dixstruct.h" -#endif #ifdef XKB #include "xkbsrv.h" @@ -635,10 +633,8 @@ void UseMsg(void) ErrorF("+rrxinerama Enable XINERAMA (via RandR) extension (default)\n"); ErrorF("-rrxinerama Disable XINERAMA (via RandR) extension\n"); #endif -#ifdef SMART_SCHEDULE ErrorF("-dumbSched Disable smart scheduling, enable old behavior\n"); ErrorF("-schedInterval int Set scheduler interval in msec\n"); -#endif ErrorF("+extension name Enable extension\n"); ErrorF("-extension name Disable extension\n"); #ifdef XDMCP @@ -1038,7 +1034,6 @@ ProcessCommandLine(int argc, char *argv[]) i = skip - 1; } #endif -#ifdef SMART_SCHEDULE else if ( strcmp( argv[i], "-dumbSched") == 0) { SmartScheduleDisable = TRUE; @@ -1062,7 +1057,6 @@ ProcessCommandLine(int argc, char *argv[]) else UseMsg(); } -#endif #ifdef RENDER else if ( strcmp( argv[i], "-render" ) == 0) { @@ -1367,8 +1361,6 @@ XNFstrdup(const char *s) return ret; } -#ifdef SMART_SCHEDULE - unsigned long SmartScheduleIdleCount; Bool SmartScheduleIdle; Bool SmartScheduleTimerStopped; @@ -1494,7 +1486,6 @@ SmartScheduleInit (void) return FALSE; #endif } -#endif #ifdef SIG_BLOCK static sigset_t PreviousSignalMask; |