From: Eric Biggers <ebiggers@google.com>
Date: Sat, 29 Jul 2017 04:13:41 +0000 (-0700)
Subject: src: include <sys/sysmacros.h> for major() and minor()
X-Git-Tag: v2022.05.01~1933
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=85e3bf85c67c322bff83d131f93dc9c77685e2f4;p=users%2Fhch%2Fxfstests-dev.git

src: include <sys/sysmacros.h> for major() and minor()

This resolves the following deprecation warning (and other instances of
the same warning) when compiling with glibc 2.25 or later:

stat_test.c: In function 'cmp_statx':
stat_test.c:251:13: warning: In the GNU C Library, "major" 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 "major", include <sys/sysmacros.h>
 directly. If you did not intend to use a system-defined macro
 "major", you should undefine it after including <sys/types.h>.
  devcmp(dev);
             ^

Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
---

diff --git a/src/fssum.c b/src/fssum.c
index 88e75621c..04052cdc8 100644
--- a/src/fssum.c
+++ b/src/fssum.c
@@ -31,6 +31,7 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/sysmacros.h>
 #ifdef __SOLARIS__
 #include <sys/mkdev.h>
 #endif
diff --git a/src/stat_test.c b/src/stat_test.c
index fc87ed5c6..198c1332f 100644
--- a/src/stat_test.c
+++ b/src/stat_test.c
@@ -19,6 +19,7 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/sysmacros.h>
 #include "statx.h"
 
 static bool failed = false;