From: Jan Moskyto Matejka <mq@ucw.cz>
Date: Tue, 10 May 2016 12:30:49 +0000 (+0200)
Subject: Merge branch 'int-new' into int-new-merged
X-Git-Tag: v2.0.0-pre0~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c6dfe52369a59d7f3da8ee6bc7c505e3da5c064;p=thirdparty%2Fbird.git

Merge branch 'int-new' into int-new-merged
---

0c6dfe52369a59d7f3da8ee6bc7c505e3da5c064
diff --cc sysdep/unix/io.c
index 37e26c9b8,afa51be7d..4db6abb7b
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@@ -38,11 -37,11 +38,11 @@@
  #include "lib/string.h"
  #include "nest/iface.h"
  
- #include "lib/unix.h"
- #include "lib/sysio.h"
+ #include "sysdep/unix/unix.h"
+ #include CONFIG_INCLUDE_SYSIO_H
  
  /* Maximum number of calls of tx handler for one socket in one
 - * select iteration. Should be small enough to not monopolize CPU by
 + * poll iteration. Should be small enough to not monopolize CPU by
   * one protocol instance.
   */
  #define MAX_STEPS 4