author | Marc Fournier <marc.fournier@camptocamp.com> | |
Wed, 6 Apr 2016 19:40:37 +0000 (21:40 +0200) | ||
committer | Marc Fournier <marc.fournier@camptocamp.com> | |
Wed, 6 Apr 2016 19:40:37 +0000 (21:40 +0200) |
Remove broken filter syntax from collectd.conf(5)
configure.ac | patch | blob | history | |
src/utils_mount.c | patch | blob | history |
diff --git a/configure.ac b/configure.ac
index fb9ef34cdc80266d08302f7828802f8c1ee6aecf..5e4c309ac0b110a815a9f6a6de105ab66fe9e501 100644 (file)
--- a/configure.ac
+++ b/configure.ac
#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 kvm.h wordexp.h)
+AC_CHECK_HEADERS([ \
+ ctype.h \
+ fs_info.h \
+ fshelp.h \
+ grp.h \
+ kvm.h \
+ limits.h \
+ mntent.h \
+ mnttab.h \
+ paths.h \
+ pwd.h \
+ sys/fs_types.h \
+ sys/fstyp.h \
+ sys/mntent.h \
+ sys/mnttab.h \
+ sys/statfs.h \
+ sys/statvfs.h \
+ sys/un.h \
+ sys/vfs.h \
+ sys/vfstab.h \
+ wordexp.h \
+])
+
+AC_CHECK_HEADERS([xfs/xqm.h], [], [],
+[
+#define _GNU_SOURCE
+])
# For the dns plugin
AC_CHECK_HEADERS(arpa/nameser.h)
diff --git a/src/utils_mount.c b/src/utils_mount.c
index 6555b4185d5353216e6b2e4cb4212fd7ed90e3e1..d303677d4e6b0f88b2153fcd85b17a5ab50b7f3a 100644 (file)
--- a/src/utils_mount.c
+++ b/src/utils_mount.c
# include "config.h"
#endif
-#include "common.h"
#if HAVE_XFS_XQM_H
+# define _GNU_SOURCE
# include <xfs/xqm.h>
#define XFS_SUPER_MAGIC_STR "XFSB"
#define XFS_SUPER_MAGIC2_STR "BSFX"
#endif
+#include "common.h"
#include "plugin.h"
#include "utils_mount.h"