diff options
Diffstat (limited to 'meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch')
-rw-r--r-- | meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch b/meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch index 4cf809290d..e10905c63b 100644 --- a/meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch +++ b/meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6d369e8f226594632ce4260129509daf7030de0a Mon Sep 17 00:00:00 2001 | 1 | From b431cb4e1ed060122fa300dc0008f74080d38f73 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 9 May 2016 22:03:57 +0000 | 3 | Date: Mon, 9 May 2016 22:03:57 +0000 |
4 | Subject: [PATCH] mdadm.h: Undefine dprintf before redefining | 4 | Subject: [PATCH] mdadm.h: Undefine dprintf before redefining |
@@ -14,17 +14,16 @@ In file included from policy.c:25: | |||
14 | /mnt/oe/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/bits/stdio2.h:145:12: note: previous definition is here | 14 | /mnt/oe/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/bits/stdio2.h:145:12: note: previous definition is here |
15 | 15 | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
17 | --- | ||
18 | Upstream-Status: Pending | ||
19 | 17 | ||
18 | --- | ||
20 | mdadm.h | 2 ++ | 19 | mdadm.h | 2 ++ |
21 | 1 file changed, 2 insertions(+) | 20 | 1 file changed, 2 insertions(+) |
22 | 21 | ||
23 | diff --git a/mdadm.h b/mdadm.h | 22 | diff --git a/mdadm.h b/mdadm.h |
24 | index 230e60f..8c8f4d1 100755 | 23 | index 387e681..bb943bf 100644 |
25 | --- a/mdadm.h | 24 | --- a/mdadm.h |
26 | +++ b/mdadm.h | 25 | +++ b/mdadm.h |
27 | @@ -1554,11 +1554,13 @@ static inline char *to_subarray(struct mdstat_ent *ent, char *container) | 26 | @@ -1649,11 +1649,13 @@ static inline char *to_subarray(struct mdstat_ent *ent, char *container) |
28 | } | 27 | } |
29 | 28 | ||
30 | #ifdef DEBUG | 29 | #ifdef DEBUG |
@@ -38,6 +37,3 @@ index 230e60f..8c8f4d1 100755 | |||
38 | #define dprintf(fmt, arg...) \ | 37 | #define dprintf(fmt, arg...) \ |
39 | ({ if (0) fprintf(stderr, "%s: %s: " fmt, Name, __func__, ##arg); 0; }) | 38 | ({ if (0) fprintf(stderr, "%s: %s: " fmt, Name, __func__, ##arg); 0; }) |
40 | #define dprintf_cont(fmt, arg...) \ | 39 | #define dprintf_cont(fmt, arg...) \ |
41 | -- | ||
42 | 1.9.1 | ||
43 | |||