* [PATCH v2] include/common.h: fix build against recent 0.9.33 uClibc
@ 2014-04-16 4:52 Baruch Siach
2014-04-17 19:00 ` Mike Frysinger
2014-04-21 16:46 ` Brian Norris
0 siblings, 2 replies; 3+ messages in thread
From: Baruch Siach @ 2014-04-16 4:52 UTC (permalink / raw)
To: linux-mtd; +Cc: Baruch Siach, Mike Frysinger
An implementation of rpmatch() was backported to the 0.9.33 branch of uClibc.
So the uClibc version check introduced in commit 50c9e11f7e (include/common.h:
fix build against current uClibc) is not enough. Rename the local rpmatch()
implementation to avoid collision.
Cc: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
v2:
#undef rpmatch before redefining it (Mike Frysinger)
---
include/common.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/include/common.h b/include/common.h
index 3b1366e..6895e5c 100644
--- a/include/common.h
+++ b/include/common.h
@@ -107,7 +107,9 @@ extern "C" {
#if __UCLIBC_MAJOR__ == 0 && \
(__UCLIBC_MINOR__ < 9 || \
(__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ < 34))
-static inline int rpmatch(const char *resp)
+#undef rpmatch
+#define rpmatch __rpmatch
+static inline int __rpmatch(const char *resp)
{
return (resp[0] == 'y' || resp[0] == 'Y') ? 1 :
(resp[0] == 'n' || resp[0] == 'N') ? 0 : -1;
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] include/common.h: fix build against recent 0.9.33 uClibc
2014-04-16 4:52 [PATCH v2] include/common.h: fix build against recent 0.9.33 uClibc Baruch Siach
@ 2014-04-17 19:00 ` Mike Frysinger
2014-04-21 16:46 ` Brian Norris
1 sibling, 0 replies; 3+ messages in thread
From: Mike Frysinger @ 2014-04-17 19:00 UTC (permalink / raw)
To: Baruch Siach; +Cc: linux-mtd
[-- Attachment #1: Type: text/plain, Size: 51 bytes --]
Acked-by: Mike Frysinger <vapier@gentoo.org>
-mike
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] include/common.h: fix build against recent 0.9.33 uClibc
2014-04-16 4:52 [PATCH v2] include/common.h: fix build against recent 0.9.33 uClibc Baruch Siach
2014-04-17 19:00 ` Mike Frysinger
@ 2014-04-21 16:46 ` Brian Norris
1 sibling, 0 replies; 3+ messages in thread
From: Brian Norris @ 2014-04-21 16:46 UTC (permalink / raw)
To: Baruch Siach; +Cc: Mike Frysinger, linux-mtd
On Wed, Apr 16, 2014 at 07:52:48AM +0300, Baruch Siach wrote:
> An implementation of rpmatch() was backported to the 0.9.33 branch of uClibc.
> So the uClibc version check introduced in commit 50c9e11f7e (include/common.h:
> fix build against current uClibc) is not enough. Rename the local rpmatch()
> implementation to avoid collision.
>
> Cc: Mike Frysinger <vapier@gentoo.org>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
> v2:
> #undef rpmatch before redefining it (Mike Frysinger)
Pushed to mtd-utils.git. Thanks!
Brian
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-04-21 16:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-16 4:52 [PATCH v2] include/common.h: fix build against recent 0.9.33 uClibc Baruch Siach
2014-04-17 19:00 ` Mike Frysinger
2014-04-21 16:46 ` Brian Norris
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.