1*4882a593SmuzhiyunFrom b431cb4e1ed060122fa300dc0008f74080d38f73 Mon Sep 17 00:00:00 2001
2*4882a593SmuzhiyunFrom: Khem Raj <raj.khem@gmail.com>
3*4882a593SmuzhiyunDate: Mon, 9 May 2016 22:03:57 +0000
4*4882a593SmuzhiyunSubject: [PATCH] mdadm.h: Undefine dprintf before redefining
5*4882a593Smuzhiyun
6*4882a593Smuzhiyundprintf is also defined in libc see
7*4882a593Smuzhiyunusr/include/bits/stdio2.h, this comes into
8*4882a593Smuzhiyunplay especially when fortify sources is enabled
9*4882a593Smuzhiyunand compilers like clang reports the override
10*4882a593Smuzhiyun
11*4882a593SmuzhiyunIn file included from policy.c:25:
12*4882a593Smuzhiyun./mdadm.h:1562:9: error: 'dprintf' macro redefined [-Werror,-Wmacro-redefined]
13*4882a593Smuzhiyun        ^
14*4882a593Smuzhiyun/mnt/oe/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/bits/stdio2.h:145:12: note: previous definition is here
15*4882a593Smuzhiyun
16*4882a593SmuzhiyunSigned-off-by: Khem Raj <raj.khem@gmail.com>
17*4882a593SmuzhiyunUpstream-Status: Pending
18*4882a593Smuzhiyun---
19*4882a593Smuzhiyun mdadm.h | 2 ++
20*4882a593Smuzhiyun 1 file changed, 2 insertions(+)
21*4882a593Smuzhiyun
22*4882a593Smuzhiyundiff --git a/mdadm.h b/mdadm.h
23*4882a593Smuzhiyunindex 387e681..bb943bf 100644
24*4882a593Smuzhiyun--- a/mdadm.h
25*4882a593Smuzhiyun+++ b/mdadm.h
26*4882a593Smuzhiyun@@ -1649,11 +1649,13 @@ static inline char *to_subarray(struct mdstat_ent *ent, char *container)
27*4882a593Smuzhiyun }
28*4882a593Smuzhiyun
29*4882a593Smuzhiyun #ifdef DEBUG
30*4882a593Smuzhiyun+#undef dprintf
31*4882a593Smuzhiyun #define dprintf(fmt, arg...) \
32*4882a593Smuzhiyun 	fprintf(stderr, "%s: %s: "fmt, Name, __func__, ##arg)
33*4882a593Smuzhiyun #define dprintf_cont(fmt, arg...) \
34*4882a593Smuzhiyun 	fprintf(stderr, fmt, ##arg)
35*4882a593Smuzhiyun #else
36*4882a593Smuzhiyun+#undef dprintf
37*4882a593Smuzhiyun #define dprintf(fmt, arg...) \
38*4882a593Smuzhiyun         ({ if (0) fprintf(stderr, "%s: %s: " fmt, Name, __func__, ##arg); 0; })
39*4882a593Smuzhiyun #define dprintf_cont(fmt, arg...) \
40