From 3e4226ffdf20a7d060cd43dd0fad2829cef43755 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Tue, 2 Jan 2018 21:05:29 +0100 Subject: [PATCH] Simplify getrlimit64.c 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. --- ChangeLog | 4 ++++ sysdeps/unix/sysv/linux/getrlimit64.c | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ba8fff6136..ac0d65e168 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,10 @@ (settrlimit): Rename into setrlimit. (__sttrlimit): Rename into __setrlimit. + * 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. + 2018-01-02 Joseph Myers * sysdeps/powerpc/nofpu/libm-test-ulps: Update. diff --git a/sysdeps/unix/sysv/linux/getrlimit64.c b/sysdeps/unix/sysv/linux/getrlimit64.c index 3dcab58711..3750cf22fa 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;