summaryrefslogtreecommitdiff
path: root/proto
diff options
context:
space:
mode:
Diffstat (limited to 'proto')
-rw-r--r--proto/bfd/bfd.h6
-rw-r--r--proto/bfd/io.h2
-rw-r--r--proto/radv/config.Y2
3 files changed, 5 insertions, 5 deletions
diff --git a/proto/bfd/bfd.h b/proto/bfd/bfd.h
index f4ab3fcc..9b61be64 100644
--- a/proto/bfd/bfd.h
+++ b/proto/bfd/bfd.h
@@ -28,9 +28,9 @@
#define BFD_ECHO_PORT 3785
#define BFD_MULTI_CTL_PORT 4784
-#define BFD_DEFAULT_MIN_RX_INT (10 _MS)
-#define BFD_DEFAULT_MIN_TX_INT (100 _MS)
-#define BFD_DEFAULT_IDLE_TX_INT (1 _S)
+#define BFD_DEFAULT_MIN_RX_INT (10 MS_)
+#define BFD_DEFAULT_MIN_TX_INT (100 MS_)
+#define BFD_DEFAULT_IDLE_TX_INT (1 S_)
#define BFD_DEFAULT_MULTIPLIER 5
diff --git a/proto/bfd/io.h b/proto/bfd/io.h
index 3f166a47..641ee054 100644
--- a/proto/bfd/io.h
+++ b/proto/bfd/io.h
@@ -75,7 +75,7 @@ static inline void
tm2_start_max(timer2 *t, btime after)
{
btime rem = tm2_remains(t);
- tm2_start(t, _MAX(rem, after));
+ tm2_start(t, MAX_(rem, after));
}
*/
diff --git a/proto/radv/config.Y b/proto/radv/config.Y
index c5b7aaee..ff70a2f7 100644
--- a/proto/radv/config.Y
+++ b/proto/radv/config.Y
@@ -113,7 +113,7 @@ radv_iface_finish:
struct radv_iface_config *ic = RADV_IFACE;
if (ic->min_ra_int == (u32) -1)
- ic->min_ra_int = _MAX(ic->max_ra_int / 3, 3);
+ ic->min_ra_int = MAX_(ic->max_ra_int / 3, 3);
if (ic->default_lifetime == (u32) -1)
ic->default_lifetime = 3 * ic->max_ra_int;