diff options
| author | Jan Moskyto Matejka <mq@ucw.cz> | 2016-05-10 14:30:49 +0200 |
|---|---|---|
| committer | Jan Moskyto Matejka <mq@ucw.cz> | 2016-05-10 14:30:49 +0200 |
| commit | 0c6dfe52369a59d7f3da8ee6bc7c505e3da5c064 (patch) | |
| tree | 264aa0aa4e9393491d74d473181faab4ae288cb9 /nest/protocol.h | |
| parent | 7a7ac656829223713f9e6bcef63d2b5a5efce7d2 (diff) | |
| parent | 92912f063a94bd7c743a25628ca2073380e09ef4 (diff) | |
Merge branch 'int-new' into int-new-merged
Diffstat (limited to 'nest/protocol.h')
| -rw-r--r-- | nest/protocol.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nest/protocol.h b/nest/protocol.h index 19f5d070..2d640504 100644 --- a/nest/protocol.h +++ b/nest/protocol.h @@ -12,7 +12,7 @@ #include "lib/lists.h" #include "lib/resource.h" #include "lib/event.h" -#include "lib/timer.h" +#include "sysdep/unix/timer.h" #include "nest/route.h" #include "conf/conf.h" @@ -271,7 +271,7 @@ proto_get_router_id(struct proto_config *pc) } /* Moved from route.h to avoid dependency conflicts */ -static inline void rte_update(struct proto *p, net *net, rte *new) { rte_update2(p->main_channel, net, new, p->main_source); } +static inline void rte_update(struct proto *p, net_addr *n, rte *new) { rte_update2(p->main_channel, n, new, p->main_source); } extern list proto_list; |