From: Florian Forster <octo@collectd.org>
Date: Tue, 6 Sep 2016 06:42:26 +0000 (+0200)
Subject: Merge branch 'collectd-5.5' into collectd-5.6
X-Git-Tag: collectd-5.6.0~2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=ed985cb9d3d89aec3490b17e0fda3ee97908f935;p=collectd.git

Merge branch 'collectd-5.5' into collectd-5.6
---

ed985cb9d3d89aec3490b17e0fda3ee97908f935
diff --cc src/utils_mount.c
index b8dabb17,37b52d68..e527c258
--- a/src/utils_mount.c
+++ b/src/utils_mount.c
@@@ -24,8 -24,12 +24,13 @@@
  # 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"