forked from pool/mdadm
40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
|
From 452dc4d13a012cdcb05088c0dbc699959c4d6c73 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Baruch Siach <baruch@tkos.co.il>
|
||
|
|
Date: Tue, 6 Aug 2019 16:05:23 +0300
|
||
|
|
Subject: [PATCH] mdadm.h: include sysmacros.h unconditionally
|
||
|
|
Git-commit: 452dc4d13a012cdcb05088c0dbc699959c4d6c73
|
||
|
|
Patch-mainline: mdadm-4.1+
|
||
|
|
References: jsc#SLE-10078, jsc#SLE-9348
|
||
|
|
|
||
|
|
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>
|
||
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
||
|
|
Signed-off-by: Coly Li <colyli@suse.de>
|
||
|
|
|
||
|
|
---
|
||
|
|
mdadm.h | 2 --
|
||
|
|
1 file changed, 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/mdadm.h b/mdadm.h
|
||
|
|
index c36d7fd..d61a9ca 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.25.0
|
||
|
|
|