From patchwork Sat Dec 30 18:44:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 854145 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-88680-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="MeLBcM83"; dkim-atps=neutral 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 3z8D4W5QGDz9s7s for ; Sun, 31 Dec 2017 06:27:39 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=N6P9SDDcPN2p3ZMcU33Kbk2jvbXy01O cQmGcXtDOPUD2q0e3Iuuq0dg2WpAT29LuugBV1nQSEUJf9Byh2EPhao4kNL5mWS+ DGe5OhCsJ4wji7/a5tg+OlVx/xdw72MZ4T83IjcRslUOAaeOUMB1jiosA79YdtA1 TYjRxuUKXgvM= 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:from:to:cc:subject:date:message-id:in-reply-to :references; s=default; bh=UzXCTwkhceHR3C2GKErjuW4lsJw=; b=MeLBc M83gr8A/zIEdsI9oji1eoNtIJiG6ycoVgx4yoCjdd2MWJAc3cOVrGHp4XylFVpNJ 1jByTlVxW7E28BCVD+ZsBFBvjjQVvUajUcQEnwnN+mS+jWJADHC9jOKidneVQCCE V3VQ+Pqj9UwhPGtdw7a42VsHFpTtv3Vq28lIqE= Received: (qmail 106018 invoked by alias); 30 Dec 2017 19:27:33 -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 106002 invoked by uid 89); 30 Dec 2017 19:27:33 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=6011, H*Ad:U*rth X-HELO: hall.aurel32.net From: Aurelien Jarno To: libc-alpha@sourceware.org Cc: Richard Henderson , Aurelien Jarno Subject: [PATCH 4/4] Simplify getrlimit64.c Date: Sat, 30 Dec 2017 19:44:41 +0100 Message-Id: <20171230184441.25392-5-aurelien@aurel32.net> In-Reply-To: <20171230184441.25392-1-aurelien@aurel32.net> References: <20171230184441.25392-1-aurelien@aurel32.net> Changelog: * sysdeps/unix/sysv/linux/alpha/getrlimit64.c (__old_getrlimit64): Drop __RLIM_T_MATCHES_RLIM64_T conditional as __old_getrlimit64 is never defined in that case. Reviewed-by: Adhemerval Zanella --- ChangeLog | 6 ++++++ sysdeps/unix/sysv/linux/getrlimit64.c | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 663a9186e4..598499fd78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-12-30 Aurelien Jarno + + * sysdeps/unix/sysv/linux/alpha/getrlimit64.c (__old_getrlimit64): + Drop __RLIM_T_MATCHES_RLIM64_T conditional as __old_getrlimit64 is + never defined in that case. + 2017-12-30 Aurelien Jarno * sysdeps/unix/sysv/linux/alpha/getrlimit64.c: Fix a typo in the diff --git a/sysdeps/unix/sysv/linux/getrlimit64.c b/sysdeps/unix/sysv/linux/getrlimit64.c index 53cb4bb4d8..1310d179d0 100644 --- a/sysdeps/unix/sysv/linux/getrlimit64.c +++ b/sysdeps/unix/sysv/linux/getrlimit64.c @@ -60,11 +60,7 @@ int attribute_compat_text_section __old_getrlimit64 (enum __rlimit_resource resource, struct rlimit64 *rlimits) { -# if __RLIM_T_MATCHES_RLIM64_T -# define rlimits32 (*rlimits) -# else struct rlimit rlimits32; -# endif if (__new_getrlimit (resource, &rlimits32) < 0) return -1;