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.

diff --git a/ChangeLog b/ChangeLog
index ba8fff6136c653b0800f373b332ee78cc2140056..ac0d65e16816adb141bab8653c9c7b6fae6c7189 100644 (file)
--- 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  <joseph@codesourcery.com>
 
        * sysdeps/powerpc/nofpu/libm-test-ulps: Update.

diff --git a/sysdeps/unix/sysv/linux/getrlimit64.c b/sysdeps/unix/sysv/linux/getrlimit64.c
index 3dcab58711cd1f9ed5bac60e02d1c13af61ab90d..3750cf22fa58b422b06253113c0c572e2b5b59a9 100644 (file)
--- 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;