diff options
| author | Maria Matejka <mq@ucw.cz> | 2021-12-01 13:02:44 +0100 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2021-12-01 13:04:52 +0100 |
| commit | b50224a00351904f25a5105a98d56a62ed2c33a4 (patch) | |
| tree | 8478675603fd2a91fb4f36f8ac2e4ffd0ac20cd3 /sysdep/unix | |
| parent | 55ee9961e0d130bb16b22b7b5acffd815f266d63 (diff) | |
| parent | f772afc525156498900770ffe5a98349df89a45c (diff) | |
Merge branch 'master' into HEAD
Diffstat (limited to 'sysdep/unix')
| -rw-r--r-- | sysdep/unix/alloc.c | 2 | ||||
| -rw-r--r-- | sysdep/unix/io-loop.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/sysdep/unix/alloc.c b/sysdep/unix/alloc.c index 77c504e3..d18f286b 100644 --- a/sysdep/unix/alloc.c +++ b/sysdep/unix/alloc.c @@ -8,6 +8,8 @@ #include "nest/bird.h" #include "lib/resource.h" +#include "lib/lists.h" +#include "lib/event.h" #include "sysdep/unix/io-loop.h" diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c index 732ea64d..a9927b39 100644 --- a/sysdep/unix/io-loop.c +++ b/sysdep/unix/io-loop.c @@ -340,6 +340,7 @@ birdloop_init(void) timers_init(&main_birdloop.time, &root_pool); root_pool.loop = &main_birdloop; + main_birdloop.pool = &root_pool; birdloop_enter_locked(&main_birdloop); } |