* [PATCH] include/common.h: fix build against recent 0.9.33 uClibc
@ 2014-04-15 20:16 Baruch Siach
2014-04-15 23:09 ` Mike Frysinger
0 siblings, 1 reply; 3+ messages in thread
From: Baruch Siach @ 2014-04-15 20:16 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>
---
include/common.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/common.h b/include/common.h
index 3b1366e927c4..838dc757bdf1 100644
--- a/include/common.h
+++ b/include/common.h
@@ -107,7 +107,8 @@ extern "C" {
#if __UCLIBC_MAJOR__ == 0 && \
(__UCLIBC_MINOR__ < 9 || \
(__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ < 34))
-static inline int rpmatch(const char *resp)
+#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] include/common.h: fix build against recent 0.9.33 uClibc
2014-04-15 20:16 [PATCH] include/common.h: fix build against recent 0.9.33 uClibc Baruch Siach
@ 2014-04-15 23:09 ` Mike Frysinger
2014-04-16 4:27 ` Baruch Siach
0 siblings, 1 reply; 3+ messages in thread
From: Mike Frysinger @ 2014-04-15 23:09 UTC (permalink / raw)
To: Baruch Siach; +Cc: linux-mtd
[-- Attachment #1: Type: text/plain, Size: 948 bytes --]
On Tue 15 Apr 2014 23:16:43 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>
> ---
> include/common.h | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/include/common.h b/include/common.h
> index 3b1366e927c4..838dc757bdf1 100644
> --- a/include/common.h
> +++ b/include/common.h
> @@ -107,7 +107,8 @@ extern "C" {
> #if __UCLIBC_MAJOR__ == 0 && \
> (__UCLIBC_MINOR__ < 9 || \
> (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ < 34))
> -static inline int rpmatch(const char *resp)
> +#define rpmatch __rpmatch
probably want to:
#undef rpmatch
-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] include/common.h: fix build against recent 0.9.33 uClibc
2014-04-15 23:09 ` Mike Frysinger
@ 2014-04-16 4:27 ` Baruch Siach
0 siblings, 0 replies; 3+ messages in thread
From: Baruch Siach @ 2014-04-16 4:27 UTC (permalink / raw)
To: Mike Frysinger; +Cc: linux-mtd
Hi Mike,
On Tue, Apr 15, 2014 at 07:09:45PM -0400, Mike Frysinger wrote:
> On Tue 15 Apr 2014 23:16:43 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>
> > ---
> > include/common.h | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/include/common.h b/include/common.h
> > index 3b1366e927c4..838dc757bdf1 100644
> > --- a/include/common.h
> > +++ b/include/common.h
> > @@ -107,7 +107,8 @@ extern "C" {
> > #if __UCLIBC_MAJOR__ == 0 && \
> > (__UCLIBC_MINOR__ < 9 || \
> > (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ < 34))
> > -static inline int rpmatch(const char *resp)
> > +#define rpmatch __rpmatch
>
> probably want to:
> #undef rpmatch
Thanks for reviewing. I'll update and repost.
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch@tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-04-16 4:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-15 20:16 [PATCH] include/common.h: fix build against recent 0.9.33 uClibc Baruch Siach
2014-04-15 23:09 ` Mike Frysinger
2014-04-16 4:27 ` Baruch Siach
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.