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 /conf/conf.h | |
parent | 7a7ac656829223713f9e6bcef63d2b5a5efce7d2 (diff) | |
parent | 92912f063a94bd7c743a25628ca2073380e09ef4 (diff) |
Merge branch 'int-new' into int-new-merged
Diffstat (limited to 'conf/conf.h')
-rw-r--r-- | conf/conf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/conf.h b/conf/conf.h index 8e490c7b..03fecd32 100644 --- a/conf/conf.h +++ b/conf/conf.h @@ -10,7 +10,7 @@ #define _BIRD_CONF_H_ #include "lib/resource.h" -#include "lib/timer.h" +#include "sysdep/unix/timer.h" /* Configuration structure */ |