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

[Mike Frysinger <vapier@gentoo.org>]

[-- 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 --]