Evaluate _t first

diff --git a/src/include/conffile.h b/src/include/conffile.h
index 6d4523826e960c26eb6313aed349d76be56b00ec..5dbd81b6882c8d0004d17ed200885298e742d88e 100644 (file)
--- a/src/include/conffile.h
+++ b/src/include/conffile.h
@@ -161,7 +161,7 @@ typedef struct timeval _timeval_t;
        .offset = FR_CONF_TYPE_CHECK((_t), __typeof__(&(((_s *)NULL)->_f)), offsetof(_s, _f))
 #  define FR_CONF_IS_SET_OFFSET(_n, _t, _s, _f) \
        .name = _n, \
-       .type = _t | PW_TYPE_IS_SET, \
+       .type = (_t) | PW_TYPE_IS_SET, \
        .offset = FR_CONF_TYPE_CHECK((_t), __typeof__(&(((_s *)NULL)->_f)), offsetof(_s, _f)), \
        .is_set_offset = offsetof(_s, _f ## _is_set)
 #  define FR_CONF_POINTER(_n, _t, _p) \
@@ -170,7 +170,7 @@ typedef struct timeval _timeval_t;
        .data = FR_CONF_TYPE_CHECK((_t), __typeof__(_p), _p)
 #  define FR_CONF_IS_SET_POINTER(_n, _t, _p) \
        .name = _n, \
-       .type = _t | PW_TYPE_IS_SET, \
+       .type = (_t) | PW_TYPE_IS_SET, \
        .data = FR_CONF_TYPE_CHECK((_t), __typeof__(_p), _p), \
        .is_set_ptr = _p ## _is_set
 #  define FR_ITEM_POINTER(_t, _p) _t, FR_CONF_TYPE_CHECK((_t), __typeof__(_p), _p)
@@ -181,7 +181,7 @@ typedef struct timeval _timeval_t;
        .offset = offsetof(_s, _f)
 #  define FR_CONF_IS_SET_OFFSET(_n, _t, _s, _f) \
        .name = _n, \
-       .type = _t | PW_TYPE_IS_SET, \
+       .type = (_t) | PW_TYPE_IS_SET, \
        .offset = offsetof(_s, _f), \
        .is_set_offset = offsetof(_s, _f ## _is_set)
 #  define FR_CONF_POINTER(_n, _t, _p) \
@@ -190,7 +190,7 @@ typedef struct timeval _timeval_t;
        .data = _p
 #  define FR_CONF_IS_SET_POINTER(_n, _t, _p) \
        .name = _n, \
-       .type = _t | PW_TYPE_IS_SET, \
+       .type = (_t) | PW_TYPE_IS_SET, \
        .data = _p, \
        .is_set_ptr = _p ## _is_set
 #  define FR_ITEM_POINTER(_t, _p) .type = _t, .data = _p