diff -r b6fbc1c59a44 -r b2f8b91d89b5 src/timer.c
--- a/src/timer.c	Tue Apr 17 16:13:22 2007 +0200
+++ b/src/timer.c	Wed Apr 18 13:04:19 2007 +0200
@@ -32,7 +32,7 @@
 TIMEVAL total_sleep_time = TIMEVAL_MAX;
 TIMER_HANDLE last_timer_raw = -1;
 
-#define minval(a,b) ((a<b)?a:b)
+#define min_val(a,b) ((a<b)?a:b)
 
 /* ---------  Use this to declare a new alarm --------- */
 TIMER_HANDLE SetAlarm(CO_Data* d, UNS32 id, TimerCallback_t callback, TIMEVAL value, TIMEVAL period)
@@ -68,7 +68,7 @@
 		if (row_number == last_timer_raw + 1) last_timer_raw++;
 		
 		/* set next wakeup alarm if new entry is sooner than others, or if it is alone */
-		real_timer_value = minval(value, TIMEVAL_MAX);
+		real_timer_value = min_val(value, TIMEVAL_MAX);
 		elapsed_time = getElapsedTime();
 
 		/*printf("elapsed_time=%d real_timer_value=%d total_sleep_time=%d\n", elapsed_time, real_timer_value, total_sleep_time); */
@@ -131,7 +131,7 @@
 					row->val = row->interval - (overrun % row->interval);
 					row->state = TIMER_TRIG_PERIOD; /* ask for trig, periodic */
 					/* Check if this new timer value is the soonest */
-					next_wakeup = minval(row->val,next_wakeup);
+					next_wakeup = min_val(row->val,next_wakeup);
 				}
 			}
 			else
@@ -140,7 +140,7 @@
 				row->val -= real_total_sleep_time;
 
 				/* Check if this new timer value is the soonest */
-				next_wakeup = minval(row->val,next_wakeup);
+				next_wakeup = min_val(row->val,next_wakeup);
 			}
 		}
 	}