blob: acd64ada22f9626d50d4ff433568c23e0962c9ff [file] [log] [blame]
Brad Bishop6e60e8b2018-02-01 10:27:11 -05001From 943616e5dffb79f307e4bd9b249d316212998750 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 18 Dec 2016 08:30:51 +0000
4Subject: [PATCH] include <sys/sysmacros.h> for major/minor defintions
5
6glibc 2.25 is warning about it if applications depend on
7sys/types.h for these macros, it expects to be included
8from <sys/sysmacros.h>
9
10Fixes
11| Grow.c:3534:13: error: In the GNU C Library, "minor" is defined
12| by <sys/sysmacros.h>. For historical compatibility, it is
13| currently defined by <sys/types.h> as well, but we plan to
14| remove this soon. To use "minor", include <sys/sysmacros.h>
15| directly. If you did not intend to use a system-defined macro
16| "minor", you should undefine it after including <sys/types.h>. [-Werror]
17| Query.c: In function 'Query':
18| Query.c:105:13: error: In the GNU C Library, "makedev" is defined
19| by <sys/sysmacros.h>. For historical compatibility, it is
20| currently defined by <sys/types.h> as well, but we plan to
21| remove this soon. To use "makedev", include <sys/sysmacros.h>
22| directly. If you did not intend to use a system-defined macro
23| "makedev", you should undefine it after including <sys/types.h>. [-Werror]
24| makedev((unsigned)disc.major,(unsigned)disc.minor) == stb.st_rdev)
25| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
26
27Signed-off-by: Khem Raj <raj.khem@gmail.com>
28---
29Upstream-Status: Pending
30
31 mdadm.h | 1 +
32 1 file changed, 1 insertion(+)
33
34diff --git a/mdadm.h b/mdadm.h
35index 8c8f4d1..3ce13b5 100755
36--- a/mdadm.h
37+++ b/mdadm.h
38@@ -34,6 +34,7 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
39 #endif
40
41 #include <sys/types.h>
42+#include <sys/sysmacros.h>
43 #include <sys/stat.h>
44 #include <stdint.h>
45 #include <stdlib.h>
46--
471.9.1
48