From patchwork Wed Jul 5 13:24:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joshua Kinard X-Patchwork-Id: 9826525 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 45143603B5 for ; Wed, 5 Jul 2017 13:33:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 33F911FE85 for ; Wed, 5 Jul 2017 13:33:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 26B6D28384; Wed, 5 Jul 2017 13:33:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 72C401FE85 for ; Wed, 5 Jul 2017 13:33:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750871AbdGENdL (ORCPT ); Wed, 5 Jul 2017 09:33:11 -0400 Received: from resqmta-ch2-11v.sys.comcast.net ([69.252.207.43]:52362 "EHLO resqmta-ch2-11v.sys.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750837AbdGENdK (ORCPT ); Wed, 5 Jul 2017 09:33:10 -0400 X-Greylist: delayed 488 seconds by postgrey-1.27 at vger.kernel.org; Wed, 05 Jul 2017 09:33:10 EDT Received: from resomta-ch2-09v.sys.comcast.net ([69.252.207.105]) by resqmta-ch2-11v.sys.comcast.net with SMTP id SkIOdA8SfxSSiSkIgdVqXB; Wed, 05 Jul 2017 13:25:02 +0000 Received: from [192.168.1.13] ([73.201.189.102]) by resomta-ch2-09v.sys.comcast.net with SMTP id SkIed28Jfh8eeSkIfdwDyt; Wed, 05 Jul 2017 13:25:01 +0000 From: Joshua Kinard Subject: [PATCH] Fix struct rpcent for uclibc-ng To: libtirpc-devel@lists.sourceforge.net Cc: linux-nfs@vger.kernel.org, Natanael Copa , Joshua Kinard Message-ID: <229cb44f-f79e-f704-5930-9b1decacf555@gentoo.org> Date: Wed, 5 Jul 2017 09:24:49 -0400 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 Content-Language: en-US X-CMAE-Envelope: MS4wfDmIxD4GAFqzP67Z4CikOgxKPqtxzWwYUMObah9ST2mZDJxVUXtYYZE4EvafgBZjLdZkdKrMm+V7Z90YyJ99Yr1JD6t3kqhE0McAQVcBufBYQm/FgXfc ByJ7Ecm3u8FdJjcNj2YYlO6z3ktXgTtG+RFIqiNkEXc807szDE9iF9MK8Kt6Nhuzzj4gD0TQAobxYJ/HdK59rHPR69dYLf7SGEWnRijx22i9dnBek8Ro9OAO QgBeIkLKiPfGXCTa9d0W2+8HJy7BbnnjV94Sq6GV5VKPt6hBPzy3AegCzfOC7JBm Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Cc: Natanael Copa --- tirpc/rpc/rpcent.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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 */