From: Florian Forster <octo@collectd.org>
Date: Thu, 26 Nov 2015 13:22:28 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~579
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ac077f078300f47d5a6b75aaeeb0999799309283;p=collectd.git

Merge branch 'collectd-5.5'
---

ac077f078300f47d5a6b75aaeeb0999799309283
diff --cc src/daemon/common.c
index 8f22011e,53c1f08a..dfaa61aa
--- a/src/daemon/common.c
+++ b/src/daemon/common.c
@@@ -46,8 -46,11 +46,10 @@@
  
  /* for getaddrinfo */
  #include <sys/types.h>
 -#include <sys/socket.h>
  #include <netdb.h>
  
+ #include <poll.h>
+ 
  #if HAVE_NETINET_IN_H
  # include <netinet/in.h>
  #endif