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/confbase.Y | |
| parent | 7a7ac656829223713f9e6bcef63d2b5a5efce7d2 (diff) | |
| parent | 92912f063a94bd7c743a25628ca2073380e09ef4 (diff) | |
Merge branch 'int-new' into int-new-merged
Diffstat (limited to 'conf/confbase.Y')
| -rw-r--r-- | conf/confbase.Y | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/confbase.Y b/conf/confbase.Y index 22aee770..d5fd2133 100644 --- a/conf/confbase.Y +++ b/conf/confbase.Y @@ -14,7 +14,7 @@ CF_HDR #include "conf/conf.h" #include "lib/resource.h" #include "lib/socket.h" -#include "lib/timer.h" +#include "sysdep/unix/timer.h" #include "lib/string.h" #include "nest/protocol.h" #include "nest/iface.h" |