From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Thu, 25 May 2017 21:37:50 +0000 (+0200)
Subject: Merge branch 'master' into int-new
X-Git-Tag: v2.0.0~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1dc5267602062562f9adca7acfbbc2fee3b315e;p=thirdparty%2Fbird.git

Merge branch 'master' into int-new
---

a1dc5267602062562f9adca7acfbbc2fee3b315e
diff --cc conf/conf.h
index 4b245e000,bf74b76b1..af92f056b
--- a/conf/conf.h
+++ b/conf/conf.h
@@@ -9,10 -9,9 +9,11 @@@
  #ifndef _BIRD_CONF_H_
  #define _BIRD_CONF_H_
  
 -#include "lib/resource.h"
 -#include "lib/timer.h"
 +#include "sysdep/config.h"
 +#include "lib/ip.h"
+ #include "lib/hash.h"
 +#include "lib/resource.h"
 +#include "sysdep/unix/timer.h"
  
  
  /* Configuration structure */