![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Thu, 26 Nov 2015 13:22:28 +0000 (14:22 +0100) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Thu, 26 Nov 2015 13:22:28 +0000 (14:22 +0100) |
| 1 | 2 | |||
|---|---|---|---|---|
| src/apache.c | patch | | diff1 | | diff2 | | blob | history |
| src/daemon/common.c | patch | | diff1 | | diff2 | | blob | history |
| src/statsd.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc src/apache.c
Simple merge
diff --cc src/daemon/common.c
index 8f22011ed57c46c94244f8273461fce3fa7af155,53c1f08ac5aa87c362844a8189e703e96a699b77..dfaa61aa24fc4e49c6617497981b7f108819ef49
--- 1/src/daemon/common.c
--- 2/src/daemon/common.c
+++ b/src/daemon/common.c
/* 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
diff --cc src/statsd.c
Simple merge