aboutsummaryrefslogtreecommitdiffstats
path: root/conf/conf.c
diff options
context:
space:
mode:
Diffstat (limited to 'conf/conf.c')
-rw-r--r--conf/conf.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/conf/conf.c b/conf/conf.c
index c68ded7f..62477331 100644
--- a/conf/conf.c
+++ b/conf/conf.c
@@ -52,7 +52,7 @@
#include "lib/resource.h"
#include "lib/string.h"
#include "lib/event.h"
-#include "sysdep/unix/timer.h"
+#include "lib/timer.h"
#include "conf/conf.h"
#include "filter/filter.h"
@@ -341,9 +341,9 @@ config_commit(struct config *c, int type, uint timeout)
undo_available = 1;
if (timeout)
- tm2_start(config_timer, timeout S);
+ tm_start(config_timer, timeout S);
else
- tm2_stop(config_timer);
+ tm_stop(config_timer);
if (configuring)
{
@@ -384,7 +384,7 @@ config_confirm(void)
if (config_timer->expires == 0)
return CONF_NOTHING;
- tm2_stop(config_timer);
+ tm_stop(config_timer);
return CONF_CONFIRM;
}
@@ -420,7 +420,7 @@ config_undo(void)
return CONF_NOTHING;
undo_available = 0;
- tm2_stop(config_timer);
+ tm_stop(config_timer);
if (configuring)
{
@@ -468,7 +468,7 @@ config_init(void)
config_event = ev_new(&root_pool);
config_event->hook = config_done;
- config_timer = tm2_new(&root_pool);
+ config_timer = tm_new(&root_pool);
config_timer->hook = config_timeout;
}