|
@@ -0,0 +1,35 @@
|
|
|
+From 6c781ad75d92c6f65832810c44afcba1b2dffc41 Mon Sep 17 00:00:00 2001
|
|
|
+From: Baruch Siach <baruch@tkos.co.il>
|
|
|
+Date: Tue, 6 Aug 2019 16:01:15 +0300
|
|
|
+Subject: [PATCH] mdadm.h: include sysmacros.h unconditionally
|
|
|
+
|
|
|
+musl libc now also requires sys/sysmacros.h for the major/minor macros.
|
|
|
+All supported libc implementations carry sys/sysmacros.h, including
|
|
|
+diet-libc, klibc, and uclibc-ng.
|
|
|
+
|
|
|
+Cc: Hauke Mehrtens <hauke@hauke-m.de>
|
|
|
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
|
|
+---
|
|
|
+Upstream status: https://marc.info/?l=linux-raid&m=156509677018508
|
|
|
+
|
|
|
+ mdadm.h | 2 --
|
|
|
+ 1 file changed, 2 deletions(-)
|
|
|
+
|
|
|
+diff --git a/mdadm.h b/mdadm.h
|
|
|
+index c36d7fdb10f6..d61a9ca82dc1 100644
|
|
|
+--- a/mdadm.h
|
|
|
++++ b/mdadm.h
|
|
|
+@@ -45,10 +45,8 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
|
|
|
+ #include <errno.h>
|
|
|
+ #include <string.h>
|
|
|
+ #include <syslog.h>
|
|
|
+-#ifdef __GLIBC__
|
|
|
+ /* Newer glibc requires sys/sysmacros.h directly for makedev() */
|
|
|
+ #include <sys/sysmacros.h>
|
|
|
+-#endif
|
|
|
+ #ifdef __dietlibc__
|
|
|
+ #include <strings.h>
|
|
|
+ /* dietlibc has deprecated random and srandom!! */
|
|
|
+--
|
|
|
+2.20.1
|
|
|
+
|