Merge branch 'master' into XACE-SELINUX

Conflicts:

	Xext/xace.c
	Xext/xace.h
This commit is contained in:
Eamon Walsh 2007-11-14 13:35:50 -05:00 • committed by Eamon Walsh
commit 1603130236
35 changed files with 673 additions and 635 deletions

View file

@ -1508,6 +1508,8 @@ SmartScheduleStopTimer (void)
#ifdef SMART_SCHEDULE_POSSIBLE
struct itimerval timer;
if (SmartScheduleDisable)
return;
timer.it_interval.tv_sec = 0;
timer.it_interval.tv_usec = 0;
timer.it_value.tv_sec = 0;
@ -1522,6 +1524,8 @@ SmartScheduleStartTimer (void)
#ifdef SMART_SCHEDULE_POSSIBLE
struct itimerval timer;
if (SmartScheduleDisable)
return;
timer.it_interval.tv_sec = 0;
timer.it_interval.tv_usec = SmartScheduleInterval * 1000;
timer.it_value.tv_sec = 0;