Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 1 | From 6d369e8f226594632ce4260129509daf7030de0a Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Mon, 9 May 2016 22:03:57 +0000 |
| 4 | Subject: [PATCH] mdadm.h: Undefine dprintf before redefining |
| 5 | |
| 6 | dprintf is also defined in libc see |
| 7 | usr/include/bits/stdio2.h, this comes into |
| 8 | play especially when fortify sources is enabled |
| 9 | and compilers like clang reports the override |
| 10 | |
| 11 | In file included from policy.c:25: |
| 12 | ./mdadm.h:1562:9: error: 'dprintf' macro redefined [-Werror,-Wmacro-redefined] |
| 13 | ^ |
| 14 | /mnt/oe/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/bits/stdio2.h:145:12: note: previous definition is here |
| 15 | |
| 16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 17 | --- |
| 18 | Upstream-Status: Pending |
| 19 | |
| 20 | mdadm.h | 2 ++ |
| 21 | 1 file changed, 2 insertions(+) |
| 22 | |
| 23 | diff --git a/mdadm.h b/mdadm.h |
| 24 | index 230e60f..8c8f4d1 100755 |
| 25 | --- a/mdadm.h |
| 26 | +++ b/mdadm.h |
| 27 | @@ -1554,11 +1554,13 @@ static inline char *to_subarray(struct mdstat_ent *ent, char *container) |
| 28 | } |
| 29 | |
| 30 | #ifdef DEBUG |
| 31 | +#undef dprintf |
| 32 | #define dprintf(fmt, arg...) \ |
| 33 | fprintf(stderr, "%s: %s: "fmt, Name, __func__, ##arg) |
| 34 | #define dprintf_cont(fmt, arg...) \ |
| 35 | fprintf(stderr, fmt, ##arg) |
| 36 | #else |
| 37 | +#undef dprintf |
| 38 | #define dprintf(fmt, arg...) \ |
| 39 | ({ if (0) fprintf(stderr, "%s: %s: " fmt, Name, __func__, ##arg); 0; }) |
| 40 | #define dprintf_cont(fmt, arg...) \ |
| 41 | -- |
| 42 | 1.9.1 |
| 43 | |