diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2021-10-22 16:59:42 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2021-11-10 12:36:50 +0100 |
| commit | 8d4e934b08b10823f33ff74c477fec454913e952 (patch) | |
| tree | f5f3164cbececff67b90c6ba58adddd50bb52c96 | |
| parent | lib: add `debug uid XXXXX-XXXXX backtrace` (diff) | |
| download | frr-8d4e934b08b10823f33ff74c477fec454913e952.tar.xz frr-8d4e934b08b10823f33ff74c477fec454913e952.zip | |
lib: avoid include loop with assert.h
`assert.h` -> `xref.h` -> `typesafe.h` -> `assert.h`
Might be possible to do this more cleanly some way, but that way is not
obvious, so here's the "simple & dumb" approach.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
| -rw-r--r-- | lib/atomlist.c | 2 | ||||
| -rw-r--r-- | lib/frrcu.h | 2 | ||||
| -rw-r--r-- | lib/typesafe.c | 1 | ||||
| -rw-r--r-- | lib/typesafe.h | 1 |
4 files changed, 5 insertions, 1 deletions
diff --git a/lib/atomlist.c b/lib/atomlist.c index 3668b083d..b7c9516a0 100644 --- a/lib/atomlist.c +++ b/lib/atomlist.c @@ -18,6 +18,8 @@ #include "config.h" #endif +#include <assert.h> + #include "atomlist.h" void atomlist_add_head(struct atomlist_head *h, struct atomlist_item *item) diff --git a/lib/frrcu.h b/lib/frrcu.h index 380825904..ae840926b 100644 --- a/lib/frrcu.h +++ b/lib/frrcu.h @@ -17,6 +17,8 @@ #ifndef _FRRCU_H #define _FRRCU_H +#include <assert.h> + #include "memory.h" #include "atomlist.h" diff --git a/lib/typesafe.c b/lib/typesafe.c index f90b59daf..3b65a2d02 100644 --- a/lib/typesafe.c +++ b/lib/typesafe.c @@ -20,6 +20,7 @@ #include <stdlib.h> #include <string.h> +#include <assert.h> #include "typesafe.h" #include "memory.h" diff --git a/lib/typesafe.h b/lib/typesafe.h index 44c42ffbc..b284397d9 100644 --- a/lib/typesafe.h +++ b/lib/typesafe.h @@ -20,7 +20,6 @@ #include <stddef.h> #include <stdint.h> #include <stdbool.h> -#include <assert.h> #include "compiler.h" #ifdef __cplusplus |