From patchwork Wed Jun 24 22:30:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 488215 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2421F1402EC for ; Thu, 25 Jun 2015 08:30:59 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=sourceware.org header.i=@sourceware.org header.b=J8bXYuxZ; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; q= dns; s=default; b=Qz3PtEvd0rTs9LDQXw/rB3EzJ1cerKp715Us+JFcyhXnc7 J6mT5AU/MAmi8z0PkIH+0GPgKKiFdUjFclsUPWBMLpP7i3kD2GIDnd4i4+ehbGC3 g/4G3x7W7w294dk6fThCM0afiXHjXAz8/3K30cDLgtwlVYS0VxeKedqYFeyas= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; s= default; bh=mQnRO9iDhKUtGFwTKNuqRVXcJ7Q=; b=J8bXYuxZERRZnErfUSFI WY6FcQ6Afo69m9O2ozx3ISNOXKASDyRSz9BRY9QM3Ief+QUwUpMXBwheASfBn77/ pgmBAFVyjldRQf9xR6wQEh4iNJOTmDMgBdQrhXedG+pRXv4eNvxe7tUkwbcQfVsH Jrun1hzGDQTBMTq6ZJheBGU= Received: (qmail 88777 invoked by alias); 24 Jun 2015 22:30:53 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 88762 invoked by uid 89); 24 Jun 2015 22:30:52 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.3 required=5.0 tests=AWL, BAYES_50, KAM_LAZY_DOMAIN_SECURITY autolearn=no version=3.3.2 X-HELO: topped-with-meat.com MIME-Version: 1.0 From: Roland McGrath To: "GNU C. Library" Subject: [COMMITTED PATCH] NaCl: Fix glob.c build after getlogin_r -> __getlogin_r. Message-Id: <20150624223049.02D0A2C3B00@topped-with-meat.com> Date: Wed, 24 Jun 2015 15:30:48 -0700 (PDT) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.1 cv=SvUDtp+0 c=1 sm=1 tr=0 a=WkljmVdYkabdwxfqvArNOQ==:117 a=14OXPxybAAAA:8 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=mDV3o1hIAAAA:8 a=4MIME_qh044ljOgNXdIA:9 a=CjuIK1q_8ugA:10 2015-06-24 Roland McGrath * sysdeps/nacl/glob.c (getlogin_r): Macro renamed to ... (__getlogin_r): ... this. diff --git a/sysdeps/nacl/glob.c b/sysdeps/nacl/glob.c index 36d62e8..eda6e9e 100644 --- a/sysdeps/nacl/glob.c +++ b/sysdeps/nacl/glob.c @@ -16,11 +16,11 @@ License along with the GNU C Library; if not, see . */ -#include /* Declares getlogin_r. */ +#include /* Declares __getlogin_r. */ /* We do not have getlogin_r in the library at all for NaCl. Define it away so the glob code does not try to use it. */ -#define getlogin_r(name, len) (ENOSYS) +#define __getlogin_r(name, len) (ENOSYS) /* Fetch the version that defines glob64 as an alias. */ #include