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/include | |
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/include')
-rw-r--r-- | nx-X11/programs/Xserver/include/dixstruct.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/include/dixstruct.h b/nx-X11/programs/Xserver/include/dixstruct.h index 5019dea4a..ca50c7ca7 100644 --- a/nx-X11/programs/Xserver/include/dixstruct.h +++ b/nx-X11/programs/Xserver/include/dixstruct.h @@ -141,15 +141,12 @@ typedef struct _Client { struct _FontResolution * (*fontResFunc) ( /* no need for font.h */ ClientPtr /* pClient */, int * /* num */); -#ifdef SMART_SCHEDULE int smart_priority; long smart_start_tick; long smart_stop_tick; long smart_check_tick; -#endif } ClientRec; -#ifdef SMART_SCHEDULE /* * Scheduling interface */ @@ -170,8 +167,6 @@ extern Bool SmartScheduleStopTimer(void); extern Bool SmartScheduleInit(void); -#endif - /* This prototype is used pervasively in Xext, dix */ #define DISPATCH_PROC(func) int func(ClientPtr /* client */) |