mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-27 03:41:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix for [f]statfs64/[f]statfs aliasing patch

Browse Source 
* 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.
This commit is contained in:
Steve Ellcey 2016-11-28 08:51:01 -08:00
parent b5e35350aa
commit 9e878fa957
3 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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

19
sysdeps/unix/sysv/linux/fstatfs64.c
View File

@ -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. */

19
sysdeps/unix/sysv/linux/statfs64.c
View File

@ -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>