diff options
Diffstat (limited to 'lib/compiler.h')
| -rw-r--r-- | lib/compiler.h | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/lib/compiler.h b/lib/compiler.h index b7a142bdee..bbfe01b569 100644 --- a/lib/compiler.h +++ b/lib/compiler.h @@ -140,21 +140,6 @@ extern "C" { #define MACRO_REQUIRE_SEMICOLON() \ _Static_assert(1, "please add a semicolon after this macro") -#if CONFDATE < 20210601 -#ifdef ENABLE_BGP_VNC -/* temporarily disabled for transition for LabN CI - * NB: it's not possible to generate a deprecation warning for this, hence - * the shortened transition period (since otherwise new uses of the old syntax - * may creep in without errors) - */ -#undef MACRO_REQUIRE_SEMICOLON -#define MACRO_REQUIRE_SEMICOLON() \ - /* nothing */ -#endif /* ENABLE_BGP_VNC */ -#else /* CONFDATE >= 20210601 */ -CPP_NOTICE("time to remove this CONFDATE block") -#endif - /* variadic macros, use like: * #define V_0() ... * #define V_1(x) ... @@ -331,7 +316,7 @@ CPP_NOTICE("time to remove this CONFDATE block") 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, \ 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 -#define PP_NARG_(...) PP_ARG_N(__VA_ARGS__) +#define PP_NARG_(...) PP_ARG_N(__VA_ARGS__) #define PP_NARG(...) PP_NARG_(_, ##__VA_ARGS__, PP_RSEQ_N()) @@ -373,6 +358,10 @@ CPP_NOTICE("time to remove this CONFDATE block") #else /* !_FRR_ATTRIBUTE_PRINTFRR */ #define PRINTFRR(a, b) __attribute__((format(printf, a, b))) +/* frr-format plugin is C-only for now, so no point in doing these shenanigans + * for C++... (also they can break some C++ stuff...) + */ +#ifndef __cplusplus /* these should be typedefs, but might also be #define */ #ifdef uint64_t #undef uint64_t @@ -400,6 +389,8 @@ _Static_assert(sizeof(_uint64_t) == 8 && sizeof(_int64_t) == 8, #define PRIu64 "llu" #define PRId64 "lld" #define PRIx64 "llx" + +#endif /* !__cplusplus */ #endif /* !_FRR_ATTRIBUTE_PRINTFRR */ #ifdef __cplusplus |