diff -r c6ff23a48232 -r 9b5bb1dcb4f5 drivers/timers_unix/timers_unix.c --- a/drivers/timers_unix/timers_unix.c Tue Jun 20 19:02:43 2006 +0200 +++ b/drivers/timers_unix/timers_unix.c Tue Jun 20 22:43:37 2006 +0200 @@ -81,12 +81,12 @@ pthread_join(*Thread, NULL); } -#define max(a,b) a>b?a:b +#define maxval(a,b) a>b?a:b void setTimer(TIMEVAL value) { // printf("setTimer(TIMEVAL value=%d)\n", value); // TIMEVAL is us whereas setitimer wants ns... - long tv_nsec = 1000 * (max(value,1)%1000000); + long tv_nsec = 1000 * (maxval(value,1)%1000000); time_t tv_sec = value/1000000; struct itimerspec timerValues; timerValues.it_value.tv_sec = tv_sec;