diff options
| author | Jan Moskyto Matejka <mq@ucw.cz> | 2016-12-07 15:30:46 +0100 |
|---|---|---|
| committer | Jan Moskyto Matejka <mq@ucw.cz> | 2016-12-07 15:30:46 +0100 |
| commit | ad88b94bca78e010357a6c7806e1d5e01701d4a7 (patch) | |
| tree | 9c06e9c1b0c87f372dcf27cc832d5692db112e80 /proto/babel | |
| parent | d15b0b0a1b494c14b139d2d28706d82cd6e2f139 (diff) | |
| parent | af62c0f9f1f6382fe88c8ae5e514f70c0b5b6d05 (diff) | |
| download | bird-ad88b94bca78e010357a6c7806e1d5e01701d4a7.tar.gz | |
Merge branch 'int-new-rpki-squashed' (early part) into int-new
Diffstat (limited to 'proto/babel')
| -rw-r--r-- | proto/babel/Makefile | 9 | ||||
| -rw-r--r-- | proto/babel/babel.h | 6 |
2 files changed, 5 insertions, 10 deletions
diff --git a/proto/babel/Makefile b/proto/babel/Makefile index 400ffbac..d7684705 100644 --- a/proto/babel/Makefile +++ b/proto/babel/Makefile @@ -1,5 +1,4 @@ -source=babel.c packets.c -root-rel=../../ -dir-name=proto/babel - -include ../../Rules +src := babel.c packets.c +obj := $(src-o-files) +$(all-daemon) +$(cf-local) diff --git a/proto/babel/babel.h b/proto/babel/babel.h index 6a95d82f..e8b6c314 100644 --- a/proto/babel/babel.h +++ b/proto/babel/babel.h @@ -21,11 +21,7 @@ #include "lib/lists.h" #include "lib/socket.h" #include "lib/string.h" -#include "lib/timer.h" - -#ifndef IPV6 -#error "The Babel protocol only speaks IPv6" -#endif +#include "sysdep/unix/timer.h" #define EA_BABEL_METRIC EA_CODE(EAP_BABEL, 0) #define EA_BABEL_ROUTER_ID EA_CODE(EAP_BABEL, 1) |