diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2017-01-16 17:13:35 +0000 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2017-01-16 17:13:35 +0000 |
| commit | 8c9cea1d7b73629be7d7d6c198e693dff85a9c69 (patch) | |
| tree | 81a18ad3939b0d7515c52ca0a06d8ddd7d460f91 | |
| parent | 981aea91c02aa0557fe1148e3c0be249b492b1e0 (diff) | |
| parent | 89b304ebb60179b4d7cf9cb0ce1b6a297a5067b8 (diff) | |
Merge branch 'cygwin-patches-for-1.19' into cygwin-release-1.19xserver-cygwin-1.19.1-1
| -rw-r--r-- | dix/dispatch.c | 4 | ||||
| -rw-r--r-- | os/utils.c | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/dix/dispatch.c b/dix/dispatch.c index 78ac095b1..b4db19291 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -222,9 +222,13 @@ UpdateCurrentTimeIf(void) #define SMART_SCHEDULE_MAX_SLICE 15 #ifdef HAVE_SETITIMER +#if defined(WIN32) || defined(__CYGWIN__) +Bool SmartScheduleSignalEnable = FALSE; +#else #define SMART_SCHEDULE_DEFAULT_SIGNAL_ENABLE HAVE_SETITIMER Bool SmartScheduleSignalEnable = SMART_SCHEDULE_DEFAULT_SIGNAL_ENABLE; #endif +#endif long SmartScheduleSlice = SMART_SCHEDULE_DEFAULT_INTERVAL; long SmartScheduleInterval = SMART_SCHEDULE_DEFAULT_INTERVAL; diff --git a/os/utils.c b/os/utils.c index 5cd15b7ea..ddcd482e1 100644 --- a/os/utils.c +++ b/os/utils.c @@ -1019,6 +1019,9 @@ ProcessCommandLine(int argc, char *argv[]) } else if (strcmp(argv[i], "-schedInterval") == 0) { if (++i < argc) { +#if HAVE_SETITIMER + SmartScheduleSignalEnable = TRUE; +#endif SmartScheduleInterval = atoi(argv[i]); SmartScheduleSlice = SmartScheduleInterval; } @@ -1027,6 +1030,9 @@ ProcessCommandLine(int argc, char *argv[]) } else if (strcmp(argv[i], "-schedMax") == 0) { if (++i < argc) { +#if HAVE_SETITIMER + SmartScheduleSignalEnable = TRUE; +#endif SmartScheduleMaxSlice = atoi(argv[i]); } else |