GNU C Library master sources branch master updated. glibc-2.24-414-g9e878fa

[sje at sourceware dot org]

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  9e878fa9578469332a44ae7d9813a0d29697eeaf (commit)
      from  b5e35350aa715e1d06b670764564ddaaef26d747 (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=9e878fa9578469332a44ae7d9813a0d29697eeaf

commit 9e878fa9578469332a44ae7d9813a0d29697eeaf
Author: Steve Ellcey <sellcey@caviumnetworks.com>
Date:   Mon Nov 28 08:51:01 2016 -0800

    Fix for [f]statfs64/[f]statfs aliasing patch
    
    	* sysdeps/unix/sysv/linux/fstatfs64.c: Reorder include files,
    	only alias fstatfs and __fstatfs if STATFS_IS_STATFS64 is non-zero.
    	* sysdeps/unix/sysv/linux/statfs64.c: Ditto for statfs and __statfs.

diff --git a/ChangeLog b/ChangeLog
index 7b54d4d..5719580 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-11-28  Steve Ellcey  <sellcey@caviumnetworks.com>
+
+	* sysdeps/unix/sysv/linux/fstatfs64.c: Reorder include files,
+	only alias fstatfs and __fstatfs if STATFS_IS_STATFS64 is non-zero.
+	* sysdeps/unix/sysv/linux/statfs64.c: Ditto for statfs and __statfs.
+
 2016-11-28  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/unix/sysv/linux/nios2/sys/cachectl.h: Do not include
diff --git a/sysdeps/unix/sysv/linux/fstatfs64.c b/sysdeps/unix/sysv/linux/fstatfs64.c
index a95fe18..42b2257 100644
--- a/sysdeps/unix/sysv/linux/fstatfs64.c
+++ b/sysdeps/unix/sysv/linux/fstatfs64.c
@@ -16,20 +16,23 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#include <errno.h>
+#include <string.h>
+#include <stddef.h>
+#include <sysdep.h>
+#include <kernel_stat.h>
+
 /* Hide the prototypes for __fstatfs and fstatfs so that GCC will not
    complain about the different function signatures if they are aliased
    to  __fstat64.  If STATFS_IS_STATFS64 is not zero then the statfs and
    statfs64 structures have an identical layout but different type names.  */
 
-#define __fstatfs __fstatfs_disable
-#define fstatfs fstatfs_disable
-
-#include <errno.h>
-#include <string.h>
+#if STATFS_IS_STATFS64
+# define __fstatfs __fstatfs_disable
+# define fstatfs fstatfs_disable
+#endif
 #include <sys/statfs.h>
-#include <kernel_stat.h>
-#include <stddef.h>
-#include <sysdep.h>
+
 #include <kernel-features.h>
 
 /* Defined in statfs64.c.  */
diff --git a/sysdeps/unix/sysv/linux/statfs64.c b/sysdeps/unix/sysv/linux/statfs64.c
index 4315fe5..9dbd61f 100644
--- a/sysdeps/unix/sysv/linux/statfs64.c
+++ b/sysdeps/unix/sysv/linux/statfs64.c
@@ -16,20 +16,23 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#include <errno.h>
+#include <string.h>
+#include <stddef.h>
+#include <sysdep.h>
+#include <kernel_stat.h>
+
 /* Hide the prototypes for __statfs and statfs so that GCC will not
    complain about the different function signatures if they are aliased
    to  __stat64.  If STATFS_IS_STATFS64 is not zero then the statfs and
    statfs64 structures have an identical layout but different type names.  */
 
-#define __statfs __statfs_disable
-#define statfs statfs_disable
-
-#include <errno.h>
-#include <string.h>
+#if STATFS_IS_STATFS64
+# define __statfs __statfs_disable
+# define statfs statfs_disable
+#endif
 #include <sys/statfs.h>
-#include <kernel_stat.h>
-#include <stddef.h>
-#include <sysdep.h>
+
 #include <kernel-features.h>
 
 

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

Summary of changes:
 ChangeLog                           |    6 ++++++
 sysdeps/unix/sysv/linux/fstatfs64.c |   19 +++++++++++--------
 sysdeps/unix/sysv/linux/statfs64.c  |   19 +++++++++++--------
 3 files changed, 28 insertions(+), 16 deletions(-)


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