summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorIgor Ryzhov <iryzhov@nfware.com>2021-06-01 17:45:25 +0300
committerGitHub <noreply@github.com>2021-06-01 17:45:25 +0300
commit8c965eaaf41f783a67e880310e338291cac5a965 (patch)
tree0c7b3b222fdeb3df4b277f3c17c2d30ad6e9d7f6 /lib
parent2cdd73387c300818fc4cd74e1ebde1c3fc447ea0 (diff)
parentef3b48cfe1c2516c6c6490fc38682a7f640b534b (diff)
Merge pull request #8769 from ton31337/fix/time_to_remove
lib: Time to remove CONFDATE block
Diffstat (limited to 'lib')
-rw-r--r--lib/compiler.h17
1 files changed, 1 insertions, 16 deletions
diff --git a/lib/compiler.h b/lib/compiler.h
index 86cf347e01..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())