summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorOndrej Zajicek (work) <santiago@crfreenet.org>2017-06-20 15:55:39 +0200
committerOndrej Zajicek (work) <santiago@crfreenet.org>2017-12-07 13:53:42 +0100
commitee528fbd5dc482ceece52832d4a8ea5a08251bfa (patch)
tree243ea4b34196fd7a36cb42d591aa55ba86c04484 /conf
parent92cc1e745758893a57a2432a0e11e4cd3ad289b7 (diff)
Timers: Add typecast to unit-converting macros
Diffstat (limited to 'conf')
-rw-r--r--conf/confbase.Y9
1 files changed, 4 insertions, 5 deletions
diff --git a/conf/confbase.Y b/conf/confbase.Y
index 390041c4..16330984 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -80,8 +80,7 @@ CF_DECLS
%type <iface> ipa_scope
%type <i> expr bool pxlen4
-%type <i32> expr_us
-%type <time> time
+%type <time> expr_us time
%type <a> ipa
%type <net> net_ip4_ net_ip6_ net_ip6 net_ip_ net_ip net_or_ipa
%type <net_ptr> net_ net_any net_vpn4_ net_vpn6_ net_vpn_ net_roa4_ net_roa6_ net_roa_
@@ -137,9 +136,9 @@ expr:
expr_us:
- expr S { $$ = (u32) $1 * 1000000; }
- | expr MS { $$ = (u32) $1 * 1000; }
- | expr US { $$ = (u32) $1 * 1; }
+ expr S { $$ = $1 S_; }
+ | expr MS { $$ = $1 MS_; }
+ | expr US { $$ = $1 US_; }
;
/* Switches */