From: Mike F. <va...@us...> - 2006-08-22 05:16:33
|
Update of /cvsroot/ltp/ltp/testcases/kernel/timers/timer_settime In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv30723/timer_settime Modified Files: timer_settime03.c Log Message: add cast to shutup warning Index: timer_settime03.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/kernel/timers/timer_settime/timer_settime03.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** timer_settime03.c 11 Feb 2006 07:27:16 -0000 1.3 --- timer_settime03.c 22 Aug 2006 05:16:29 -0000 1.4 *************** *** 66,79 **** *****************************************************************************/ - #include "test.h" - #include "usctest.h" #include <errno.h> #include <syscall.h> #include <time.h> ! #ifndef _syscall2 ! #include <linux/unistd.h> ! #endif ! #ifndef __NR_timer_create --- 66,77 ---- *****************************************************************************/ #include <errno.h> #include <syscall.h> #include <time.h> + #include <unistd.h> ! #include "test.h" ! #include "usctest.h" ! #include "common_timers.h" #ifndef __NR_timer_create *************** *** 95,102 **** #endif - #ifndef NSEC_PER_SEC - #define NSEC_PER_SEC (1000000000L) - #endif - /* weak symbol. In newer glibc timer_create and timer_settime should be * defined. Then, they will supersede the definitions done in this code --- 93,96 ---- *************** *** 226,230 **** case 3: /* make timer_id invalid */ ! tim = -1; new_set.it_value.tv_nsec = 0; break; --- 220,224 ---- case 3: /* make timer_id invalid */ ! tim = (timer_t)-1; new_set.it_value.tv_nsec = 0; break; |