summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--kern/mach_clock.c4
-rw-r--r--kern/mach_clock.h2
3 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 7b15bd6..7d4fddc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
* kern/lock_mon.c (retry_simple_lock, retry_bit_lock): Likewise.
* kern/machine.c (Debugger): Remove declaration.
* device/net_io.c (net_deliver): Fix parenthesis to really round up.
+ * kern/mach_clock.c (timeout): Make the `fcn' parameter take a void *
+ instead of char *.
+ * kern/mach_clock.h (timeout): Likewise.
2008-07-19 Barry deFreese <bddebian@comcast.net>
diff --git a/kern/mach_clock.c b/kern/mach_clock.c
index 781101b..2c7969e 100644
--- a/kern/mach_clock.c
+++ b/kern/mach_clock.c
@@ -528,8 +528,8 @@ timer_elt_data_t timeout_timers[NTIMERS];
* interval: timeout interval, in hz.
*/
void timeout(fcn, param, interval)
- int (*fcn)(/* char * param */);
- char * param;
+ int (*fcn)( void * param );
+ void * param;
int interval;
{
spl_t s;
diff --git a/kern/mach_clock.h b/kern/mach_clock.h
index 93237aa..4e8b83e 100644
--- a/kern/mach_clock.h
+++ b/kern/mach_clock.h
@@ -99,7 +99,7 @@ extern kern_return_t host_adjust_time(
extern void mapable_time_init (void);
/* For public timer elements. */
-extern void timeout(int (*fcn)(), char *param, int interval);
+extern void timeout(int (*fcn)(void *), void *param, int interval);
extern boolean_t untimeout(int (*fcn)(), char *param);
#endif /* _KERN_MACH_CLOCK_H_ */