diff mbox

[v2] include/common.h: fix build against recent 0.9.33 uClibc

Message ID 2c54c99957bae293249f9ab2a6077570d8671260.1397623968.git.baruch@tkos.co.il
State Accepted
Commit 5923077649ca167991a24ca05bd285fdf6fa1a06
Headers show

Commit Message

Baruch Siach April 16, 2014, 4:52 a.m. UTC 
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(-)

Comments

Mike Frysinger April 17, 2014, 7 p.m. UTC | #1 
Acked-by: Mike Frysinger <vapier@gentoo.org>
-mike
Brian Norris April 21, 2014, 4:46 p.m. UTC | #2 
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
diff mbox

Patch

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;