Merge branch 'master' into mpx
Conflicts: Xi/extinit.c Xi/grabdev.c Xi/setmode.c Xi/ungrdev.c dix/devices.c dix/events.c dix/getevents.c include/dix.h mi/midispcur.c mi/misprite.c xkb/xkbActions.c xkb/xkbEvents.c xkb/xkbPrKeyEv.c
This commit is contained in:
@@ -152,11 +152,9 @@ extern long SmartScheduleTime;
|
||||
extern long SmartScheduleInterval;
|
||||
extern long SmartScheduleSlice;
|
||||
extern long SmartScheduleMaxSlice;
|
||||
extern unsigned long SmartScheduleIdleCount;
|
||||
extern Bool SmartScheduleDisable;
|
||||
extern Bool SmartScheduleIdle;
|
||||
extern Bool SmartScheduleTimerStopped;
|
||||
extern Bool SmartScheduleStartTimer(void);
|
||||
extern void SmartScheduleStartTimer(void);
|
||||
extern void SmartScheduleStopTimer(void);
|
||||
#define SMART_MAX_PRIORITY (20)
|
||||
#define SMART_MIN_PRIORITY (-20)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user