From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sat, 26 Mar 2016 18:11:32 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.2~27
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=b4cc5c7399adf79198aea816d44a42df25431d15;p=collectd.git

Merge branch 'collectd-5.4' into collectd-5.5
---

b4cc5c7399adf79198aea816d44a42df25431d15
diff --cc configure.ac
index 9112a91f,fd2e25cb..dc9d324f
--- a/configure.ac
+++ b/configure.ac
@@@ -611,7 -601,12 +611,12 @@@ AC_CHECK_HEADERS(linux/un.h, [], []
  #endif
  ])
  
- AC_CHECK_HEADERS(pwd.h grp.h sys/un.h ctype.h limits.h xfs/xqm.h fs_info.h fshelp.h paths.h mntent.h mnttab.h sys/fstyp.h sys/fs_types.h sys/mntent.h sys/mnttab.h sys/statfs.h sys/statvfs.h sys/vfs.h sys/vfstab.h sys/vmmeter.h kvm.h wordexp.h locale.h)
 -AC_CHECK_HEADERS(pwd.h grp.h sys/un.h ctype.h limits.h fs_info.h fshelp.h paths.h mntent.h mnttab.h sys/fstyp.h sys/fs_types.h sys/mntent.h sys/mnttab.h sys/statfs.h sys/statvfs.h sys/vfs.h sys/vfstab.h kvm.h wordexp.h)
++AC_CHECK_HEADERS(pwd.h grp.h sys/un.h ctype.h limits.h fs_info.h fshelp.h paths.h mntent.h mnttab.h sys/fstyp.h sys/fs_types.h sys/mntent.h sys/mnttab.h sys/statfs.h sys/statvfs.h sys/vfs.h sys/vfstab.h sys/vmmeter.h kvm.h wordexp.h locale.h)
+ 
+ AC_CHECK_HEADERS([xfs/xqm.h], [], [],
+ [
+ #define _GNU_SOURCE
+ ])
  
  # For the dns plugin
  AC_CHECK_HEADERS(arpa/nameser.h)
diff --cc src/utils_mount.c
index 4ec5fb79,d303677d..da53b980
--- a/src/utils_mount.c
+++ b/src/utils_mount.c
@@@ -32,6 -31,10 +31,13 @@@
  #define XFS_SUPER_MAGIC2_STR "BSFX"
  #endif
  
 -#include "common.h"
 -#include "plugin.h"
++#include "collectd.h"
+ #include "utils_mount.h"
+ 
++#include "common.h" /* sstrncpy() et alii */
++#include "plugin.h" /* ERROR() macro */
++
++
  #if HAVE_GETVFSSTAT
  #  if HAVE_SYS_TYPES_H
  #    include <sys/types.h>