2017-07-05 13:33:10

by Joshua Kinard

Subject: [PATCH] Fix struct rpcent for uclibc-ng

Commit 6d8d4b5a7bf6 addresses an issue for musl, based on a description of
an earlier patch at https://patchwork.kernel.org/patch/5499671/. That
description notes uncertainty with uclibc, which also defines __GLIBC__.
This patch fixes the uclibc case by also checking for __UCLIBC__.

Fixes: 6d8d4b5a7bf6 ("Include string.h for memset")
Signed-off-by: Joshua Kinard <[email protected]>
Cc: Natanael Copa <[email protected]>
---

tirpc/rpc/rpcent.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tirpc/rpc/rpcent.h b/tirpc/rpc/rpcent.h
index e07503c..9d3ef9c 100644
--- a/tirpc/rpc/rpcent.h
+++ b/tirpc/rpc/rpcent.h
@@ -49,7 +49,7 @@ extern "C" {
#endif

/* These are defined in /usr/include/rpc/netdb.h */
-#if !defined(__GLIBC__)
+#if !defined(__GLIBC__) || defined(__UCLIBC__)
struct rpcent {
char *r_name; /* name of server for this rpc program */
char **r_aliases; /* alias list */

2017-07-05 14:58:52

by Steve Dickson

Subject: Re: [PATCH] Fix struct rpcent for uclibc-ng

On 07/05/2017 09:24 AM, Joshua Kinard wrote:
> Commit 6d8d4b5a7bf6 addresses an issue for musl, based on a description of
> an earlier patch at https://patchwork.kernel.org/patch/5499671/. That
> description notes uncertainty with uclibc, which also defines __GLIBC__.
> This patch fixes the uclibc case by also checking for __UCLIBC__.
>
> Fixes: 6d8d4b5a7bf6 ("Include string.h for memset")
> Signed-off-by: Joshua Kinard <[email protected]>
> Cc: Natanael Copa <[email protected]>
Committed...

steved.

> ---
>
> tirpc/rpc/rpcent.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tirpc/rpc/rpcent.h b/tirpc/rpc/rpcent.h
> index e07503c..9d3ef9c 100644
> --- a/tirpc/rpc/rpcent.h
> +++ b/tirpc/rpc/rpcent.h
> @@ -49,7 +49,7 @@ extern "C" {
> #endif
>
> /* These are defined in /usr/include/rpc/netdb.h */
> -#if !defined(__GLIBC__)
> +#if !defined(__GLIBC__) || defined(__UCLIBC__)
> struct rpcent {
> char *r_name; /* name of server for this rpc program */
> char **r_aliases; /* alias list */
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>