diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2014-04-16 07:52:48 +0300 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2014-04-21 09:41:34 -0700 |
| commit | 5923077649ca167991a24ca05bd285fdf6fa1a06 (patch) | |
| tree | 321866a9c1527b5461d9e9aeccc1d2feac465627 | |
| parent | 7556c09cbac5c9d8a7a6d9c7c4bb736e2c472366 (diff) | |
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>
| -rw-r--r-- | include/common.h | 4 |
1 files changed, 3 insertions, 1 deletions
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; |