From: Thomas Deutschmann <whissi@gentoo.org>
Date: Fri, 2 Sep 2016 12:59:46 +0000 (+0200)
Subject: Fix compilation against >=xfsprogs-4.7.0
X-Git-Tag: collectd-5.6.0~2^2^2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=d4cfba5e74bb683e95c8423b03fafa248bda1eb5;p=collectd.git

Fix compilation against >=xfsprogs-4.7.0

[backport of commit 225ee7bb45152c51c1c9508b2e776cef36d2682d]

Suggested-by: Ruben Kerkhof <ruben@rubenkerkhof.com>
Gentoo-Bug: https://bugs.gentoo.org/590998
Fixes: https://github.com/collectd/collectd/issues/1877
---

diff --git a/src/utils_mount.c b/src/utils_mount.c
index da53b980..37b52d68 100644
--- a/src/utils_mount.c
+++ b/src/utils_mount.c
@@ -24,16 +24,17 @@
 # include "config.h"
 #endif
 
+#define _GNU_SOURCE
+
+#include "collectd.h"
+#include "utils_mount.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 "collectd.h"
-#include "utils_mount.h"
-
 #include "common.h" /* sstrncpy() et alii */
 #include "plugin.h" /* ERROR() macro */