summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--include/alarm.h9
2 files changed, 4 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index d417dab..71f6a2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -58,6 +58,7 @@ o fix wrong invocations after prototype cleanup
o set the return type of the parse functions to "void"
o use the comma operator instead of curly braces
o add missing function prototypes
+o merge several *_alarm() functions into init_alarm()
version 0.9.5 (2007/07/29)
------------------------------
diff --git a/include/alarm.h b/include/alarm.h
index c68e7f4..338968a 100644
--- a/include/alarm.h
+++ b/include/alarm.h
@@ -17,12 +17,9 @@ set_alarm_expiration(struct alarm_list *t, long tv_sec, long tv_usec)
t->tv.tv_usec = tv_usec;
}
-void set_alarm_function(struct alarm_list *t,
- void (*fcn)(struct alarm_list *a, void *data));
-
-void set_alarm_data(struct alarm_list *t, void *data);
-
-void init_alarm(struct alarm_list *t);
+void init_alarm(struct alarm_list *t,
+ void *data,
+ void (*fcn)(struct alarm_list *a, void *data));
void add_alarm(struct alarm_list *alarm);