From: Florian Forster <octo@collectd.org>
Date: Sun, 1 Apr 2012 10:07:20 +0000 (+0200)
Subject: Merge branch 'collectd-5.0'
X-Git-Tag: collectd-5.1.0~3
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=ab55c79a0fee35932995d9f492730dc131034d52;p=collectd.git

Merge branch 'collectd-5.0'
---

ab55c79a0fee35932995d9f492730dc131034d52
diff --cc src/tcpconns.c
index 6a7e32d7,78c337b7..3c8fc728
--- a/src/tcpconns.c
+++ b/src/tcpconns.c
@@@ -116,14 -116,13 +116,18 @@@
  # include <netinet/tcp_var.h>
  # include <netdb.h>
  # include <arpa/inet.h>
- # include <nlist.h>
+ # if !defined(HAVE_BSD_NLIST_H) || !HAVE_BSD_NLIST_H
+ #  include <nlist.h>
+ # else /* HAVE_BSD_NLIST_H */
+ #  include <bsd/nlist.h>
+ # endif
  # include <kvm.h>
 -#endif /* HAVE_LIBKVM_NLIST */
 +/* #endif HAVE_LIBKVM_NLIST */
 +
 +#elif KERNEL_AIX
 +# include <arpa/inet.h>
 +# include <sys/socketvar.h>
 +#endif /* KERNEL_AIX */
  
  #if KERNEL_LINUX
  static const char *tcp_state[] =