diff options
| -rw-r--r-- | ChangeLog | 19 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/fstatvfs.c | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/fstatvfs64.c | 7 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/internal_statvfs.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/internal_statvfs.h | 26 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/statvfs.c | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/statvfs64.c | 7 |
7 files changed, 50 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog index f0935d1c83..7a4e5cf5f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,25 @@ 2017-10-01 H.J. Lu <hongjiu.lu@intel.com> [BZ #18822] + * sysdeps/unix/sysv/linux/fstatvfs.c: Include "internal_statvfs.h" + instead of <sys/statvfs.h>. + (__internal_statvfs): Removed. + * sysdeps/unix/sysv/linux/fstatvfs64.c Include "internal_statvfs.h" + instead of <sys/statvfs.h>. + (__internal_statvfs64): Removed. + * sysdeps/unix/sysv/linux/internal_statvfs.c: Include + "internal_statvfs.h" instead of <sys/statvfs.h>. + * sysdeps/unix/sysv/linux/internal_statvfs.h: New file. + * sysdeps/unix/sysv/linux/statvfs.c Include "internal_statvfs.h" + instead of <sys/statvfs.h>. + (__internal_statvfs): Removed. + * sysdeps/unix/sysv/linux/statvfs64.c Include "internal_statvfs.h" + instead of <sys/statvfs.h>. + (__internal_statvfs64): Removed. + +2017-10-01 H.J. Lu <hongjiu.lu@intel.com> + + [BZ #18822] * iconv/gconv_int.h (__gconv_open): Add attribute_hidden. (__gconv_close): Likewise. (__gconv): Likewise. diff --git a/sysdeps/unix/sysv/linux/fstatvfs.c b/sysdeps/unix/sysv/linux/fstatvfs.c index e07a5b9f3d..1b2f279291 100644 --- a/sysdeps/unix/sysv/linux/fstatvfs.c +++ b/sysdeps/unix/sysv/linux/fstatvfs.c @@ -19,11 +19,7 @@ #include <stddef.h> #include <sys/stat.h> #include <sys/statfs.h> -#include <sys/statvfs.h> - -extern void __internal_statvfs (const char *name, struct statvfs *buf, - struct statfs *fsbuf, int fd); - +#include "internal_statvfs.h" int __fstatvfs (int fd, struct statvfs *buf) diff --git a/sysdeps/unix/sysv/linux/fstatvfs64.c b/sysdeps/unix/sysv/linux/fstatvfs64.c index 02a0d7ee42..c923208ea8 100644 --- a/sysdeps/unix/sysv/linux/fstatvfs64.c +++ b/sysdeps/unix/sysv/linux/fstatvfs64.c @@ -20,14 +20,9 @@ #include <string.h> #include <sys/stat.h> #include <sys/statfs.h> -#include <sys/statvfs.h> +#include "internal_statvfs.h" #include <kernel-features.h> - -extern void __internal_statvfs64 (const char *name, struct statvfs64 *buf, - struct statfs64 *fsbuf, int fd); - - /* Return information about the filesystem on which FD resides. */ int __fstatvfs64 (int fd, struct statvfs64 *buf) diff --git a/sysdeps/unix/sysv/linux/internal_statvfs.c b/sysdeps/unix/sysv/linux/internal_statvfs.c index 9a17ca5c17..0a8dc35e16 100644 --- a/sysdeps/unix/sysv/linux/internal_statvfs.c +++ b/sysdeps/unix/sysv/linux/internal_statvfs.c @@ -26,7 +26,7 @@ #include <sys/mount.h> #include <sys/stat.h> #include <sys/statfs.h> -#include <sys/statvfs.h> +#include "internal_statvfs.h" #include "linux_fsinfo.h" #include <kernel-features.h> diff --git a/sysdeps/unix/sysv/linux/internal_statvfs.h b/sysdeps/unix/sysv/linux/internal_statvfs.h new file mode 100644 index 0000000000..1762bbc6c6 --- /dev/null +++ b/sysdeps/unix/sysv/linux/internal_statvfs.h @@ -0,0 +1,26 @@ +/* Internal statvfs/statvfs64 function prototypes. + Copyright (C) 2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#include <sys/statvfs.h> + +extern void __internal_statvfs (const char *name, struct statvfs *buf, + struct statfs *fsbuf, int fd) + attribute_hidden; +extern void __internal_statvfs64 (const char *name, struct statvfs64 *buf, + struct statfs64 *fsbuf, int fd) + attribute_hidden; diff --git a/sysdeps/unix/sysv/linux/statvfs.c b/sysdeps/unix/sysv/linux/statvfs.c index 744336e33b..1edf1acca9 100644 --- a/sysdeps/unix/sysv/linux/statvfs.c +++ b/sysdeps/unix/sysv/linux/statvfs.c @@ -19,11 +19,7 @@ #include <stddef.h> #include <sys/stat.h> #include <sys/statfs.h> -#include <sys/statvfs.h> - -extern void __internal_statvfs (const char *name, struct statvfs *buf, - struct statfs *fsbuf, int fd); - +#include "internal_statvfs.h" int __statvfs (const char *file, struct statvfs *buf) diff --git a/sysdeps/unix/sysv/linux/statvfs64.c b/sysdeps/unix/sysv/linux/statvfs64.c index a89f720b38..005495fa20 100644 --- a/sysdeps/unix/sysv/linux/statvfs64.c +++ b/sysdeps/unix/sysv/linux/statvfs64.c @@ -21,14 +21,9 @@ #include <string.h> #include <sys/stat.h> #include <sys/statfs.h> -#include <sys/statvfs.h> +#include "internal_statvfs.h" #include <kernel-features.h> - -extern void __internal_statvfs64 (const char *name, struct statvfs64 *buf, - struct statfs64 *fsbuf, int fd); - - /* Return information about the filesystem on which FILE resides. */ int __statvfs64 (const char *file, struct statvfs64 *buf) |