Removed timer interval from public timer.h header and duplicated Timer_Callback to allow timer.c to build without needing #include <timer.h>

httperf/src/timer.c

@@ -41,11 +41,13 @@
 #include <heap.h>
 #include <queue.h>
 #include <httperf.h>
-#include <timer.h>
 
 #define HEAP_SIZE	4096
 #define WHEEL_SIZE	4096
 
+#define TIMER_INTERVAL	(1.0/1000)	/* timer granularity in seconds */
+typedef void    (*Timer_Callback) (struct Timer * t, Any_Type arg);
+
 static Time     now;
 static Time     next_tick;
 

httperf/src/timer.h

@@ -32,8 +32,6 @@
 #ifndef timer_h
 #define timer_h
 
-#define TIMER_INTERVAL	(1.0/1000)	/* timer granularity in seconds */
-
 struct Timer;
 typedef void    (*Timer_Callback) (struct Timer * t, Any_Type arg);