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/osinit.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/osinit.c')
| -rw-r--r-- | nx-X11/programs/Xserver/os/osinit.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/os/osinit.c b/nx-X11/programs/Xserver/os/osinit.c index 7aa961a56..59b567356 100644 --- a/nx-X11/programs/Xserver/os/osinit.c +++ b/nx-X11/programs/Xserver/os/osinit.c @@ -55,9 +55,7 @@ SOFTWARE. #include "osdep.h" #include <nx-X11/Xos.h> -#ifdef SMART_SCHEDULE #include "dixstruct.h" -#endif #ifndef PATH_MAX #ifdef MAXPATHLEN @@ -216,11 +214,9 @@ OsInit(void) * log file name if logging to a file is desired. */ LogInit(NULL, NULL); -#ifdef SMART_SCHEDULE if (!SmartScheduleDisable) if (!SmartScheduleInit ()) SmartScheduleDisable = TRUE; -#endif OsInitAllocator(); if (!OsDelayInitColors) OsInitColors(); } |