From: Baruch Siach <baruch@tkos.co.il>
Date: Wed, 16 Apr 2014 04:52:48 +0000 (+0300)
Subject: include/common.h: fix build against recent 0.9.33 uClibc
X-Git-Tag: v1.5.2~27
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5923077649ca167991a24ca05bd285fdf6fa1a06;p=mtd-utils.git

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

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.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
---

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;