| From 6d369e8f226594632ce4260129509daf7030de0a Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Mon, 9 May 2016 22:03:57 +0000 |
| Subject: [PATCH] mdadm.h: Undefine dprintf before redefining |
| |
| dprintf is also defined in libc see |
| usr/include/bits/stdio2.h, this comes into |
| play especially when fortify sources is enabled |
| and compilers like clang reports the override |
| |
| In file included from policy.c:25: |
| ./mdadm.h:1562:9: error: 'dprintf' macro redefined [-Werror,-Wmacro-redefined] |
| ^ |
| /mnt/oe/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/bits/stdio2.h:145:12: note: previous definition is here |
| |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| --- |
| Upstream-Status: Pending |
| |
| mdadm.h | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/mdadm.h b/mdadm.h |
| index 230e60f..8c8f4d1 100755 |
| --- a/mdadm.h |
| +++ b/mdadm.h |
| @@ -1554,11 +1554,13 @@ static inline char *to_subarray(struct mdstat_ent *ent, char *container) |
| } |
| |
| #ifdef DEBUG |
| +#undef dprintf |
| #define dprintf(fmt, arg...) \ |
| fprintf(stderr, "%s: %s: "fmt, Name, __func__, ##arg) |
| #define dprintf_cont(fmt, arg...) \ |
| fprintf(stderr, fmt, ##arg) |
| #else |
| +#undef dprintf |
| #define dprintf(fmt, arg...) \ |
| ({ if (0) fprintf(stderr, "%s: %s: " fmt, Name, __func__, ##arg); 0; }) |
| #define dprintf_cont(fmt, arg...) \ |
| -- |
| 1.9.1 |
| |