This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.26.9000-1062-g3e4226f


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  3e4226ffdf20a7d060cd43dd0fad2829cef43755 (commit)
       via  d35989be876fea4e0932da64a1874c29136ef1aa (commit)
      from  28fd6a44cb57afeb8a03fb8dd102cf9f5b5a5071 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=3e4226ffdf20a7d060cd43dd0fad2829cef43755

commit 3e4226ffdf20a7d060cd43dd0fad2829cef43755
Author: Aurelien Jarno <aurelien@aurel32.net>
Date:   Tue Jan 2 21:05:29 2018 +0100

    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 ba8fff6..ac0d65e 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  <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 3dcab58..3750cf2 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;

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=d35989be876fea4e0932da64a1874c29136ef1aa

commit d35989be876fea4e0932da64a1874c29136ef1aa
Author: Aurelien Jarno <aurelien@aurel32.net>
Date:   Tue Jan 2 21:05:29 2018 +0100

    Fix typos in getrlimit64.c and setrlimit64.c
    
    Changelog:
    	* sysdeps/unix/sysv/linux/alpha/getrlimit64.c: Fix a typo in the
    	comment.
    	* sysdeps/unix/sysv/linux/alpha/setrlimit64.c: Fix a typo in the
    	comment.
    	(settrlimit): Rename into setrlimit.
    	(__sttrlimit): Rename into __setrlimit.

diff --git a/ChangeLog b/ChangeLog
index cedd239..ba8fff6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2018-01-02  Aurelien Jarno <aurelien@aurel32.net>
+
+	* sysdeps/unix/sysv/linux/alpha/getrlimit64.c: Fix a typo in the
+	comment.
+	* sysdeps/unix/sysv/linux/alpha/setrlimit64.c: Fix a typo in the
+	comment.
+	(settrlimit): Rename into setrlimit.
+	(__sttrlimit): Rename into __setrlimit.
+
 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 66cb623..3dcab58 100644
--- a/sysdeps/unix/sysv/linux/getrlimit64.c
+++ b/sysdeps/unix/sysv/linux/getrlimit64.c
@@ -21,7 +21,7 @@
 #include <shlib-compat.h>
 
 /* Add this redirection so the strong_alias for __RLIM_T_MATCHES_RLIM64_T
-   linking getlimit64 to {__}getrlimit does not throw a type error.  */
+   linking getrlimit64 to {__}getrlimit does not throw a type error.  */
 #undef getrlimit
 #undef __getrlimit
 #define getrlimit getrlimit_redirect
diff --git a/sysdeps/unix/sysv/linux/setrlimit64.c b/sysdeps/unix/sysv/linux/setrlimit64.c
index 7379d6b..3ec831f 100644
--- a/sysdeps/unix/sysv/linux/setrlimit64.c
+++ b/sysdeps/unix/sysv/linux/setrlimit64.c
@@ -21,9 +21,9 @@
 #include <shlib-compat.h>
 
 /* Add this redirection so the strong_alias for __RLIM_T_MATCHES_RLIM64_T
-   linking setlimit64 to {__}setrlimit does not throw a type error.  */
-#undef settrlimit
-#undef __sttrlimit
+   linking setrlimit64 to {__}setrlimit does not throw a type error.  */
+#undef setrlimit
+#undef __setrlimit
 #define setrlimit setrlimit_redirect
 #define __setrlimit __setrlimit_redirect
 #include <sys/resource.h>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                             |   13 +++++++++++++
 sysdeps/unix/sysv/linux/getrlimit64.c |    6 +-----
 sysdeps/unix/sysv/linux/setrlimit64.c |    6 +++---
 3 files changed, 17 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]