From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Thu, 11 Aug 2016 15:44:42 +0000 (+0200)
Subject: md: fix deprecation warning with latest glibc
X-Git-Tag: collectd-5.6.0~3^2~5^2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=refs%2Fheads%2Fcollectd-5.4;p=collectd.git

md: fix deprecation warning with latest glibc

md.c: In function ‘md_process’:
md.c:120:3: warning: ‘__makedev_from_sys_types’ is deprecated:
  In the GNU C Library, `makedev' is defined by <sys/sysmacros.h>.
  For historical compatibility, it is currently defined by
  <sys/types.h> as well, but we plan to remove this soon.
  To use `makedev', include <sys/sysmacros.h> directly.
  If you did not intend to use a system-defined macro `makedev',
  you should #undef it after including <sys/types.h>.
  [-Wdeprecated-declarations]
   if (st.st_rdev != makedev (MD_MAJOR, minor))
   ^~
In file included from /usr/include/features.h:397:0,
                 from /usr/include/bits/libc-header-start.h:33,
                 from /usr/include/stdio.h:28,
                 from ./daemon/collectd.h:34,
                 from md.c:22:
---

diff --git a/configure.ac b/configure.ac
index b78dd11b..6cd3599d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -418,6 +418,7 @@ then
 #include <linux/major.h>
 #include <linux/types.h>
 ])
+	AC_CHECK_HEADERS([sys/sysmacros.h])
 else
 	have_linux_raid_md_u_h="no"
 fi
diff --git a/src/md.c b/src/md.c
index 3725f9a9..b34cc975 100644
--- a/src/md.c
+++ b/src/md.c
@@ -29,6 +29,10 @@
 #include <linux/major.h>
 #include <linux/raid/md_u.h>
 
+#ifdef HAVE_SYS_SYSMACROS_H
+#include <sys/sysmacros.h>
+#endif
+
 #define PROC_DISKSTATS "/proc/diskstats"
 #define DEV_DIR "/dev"