mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-23 17:53:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove _G_off64_t and _G_stat64 from _G_config.h.

Browse Source
This commit is contained in:
Joseph Myers 2012-10-09 15:09:32 +00:00
parent 57e605ba50
commit c8450f70fa
8 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@ -1,3 +1,21 @@
2012-10-09 Joseph Myers <joseph@codesourcery.com>
* sysdeps/generic/_G_config.h (_G_off64_t): Remove.
(_G_stat64): Likewise.
* sysdeps/unix/sysv/linux/_G_config.h (_G_off64_t): Remove.
(_G_stat64): Likewise.
* libio/filedoalloc.c (_IO_file_doallocate): Use struct stat64
instead of struct _G_stat64.
* libio/fileops.c (mmap_remap_check): Likewise.
(decide_maybe_mmap): Likewise.
(_IO_new_file_seekoff): Likewise.
(_IO_file_stat): Likewise.
* libio/libio.h (_IO_off64_t): Define to __off64_t, not
_G_off64_t.
* libio/oldfileops.c (_IO_old_file_seekoff): Use struct stat64
instead of struct _G_stat64.
* libio/wfileops.c (_IO_wfile_seekoff): Likewise.
2012-10-08 Maxim Kuvyrkov <maxim@codesourcery.com>
[BZ #14602]

2
libio/filedoalloc.c
View File

@ -96,7 +96,7 @@ _IO_file_doallocate (fp)
{
_IO_size_t size;
char *p;
struct _G_stat64 st;
struct stat64 st;
#ifndef _LIBC
/* If _IO_cleanup_registration_needed is non-zero, we should call the

8
libio/fileops.c
View File

@ -635,7 +635,7 @@ libc_hidden_ver (_IO_new_file_underflow, _IO_file_underflow)
static int
mmap_remap_check (_IO_FILE *fp)
{
struct _G_stat64 st;
struct stat64 st;
if (_IO_SYSSTAT (fp, &st) == 0
&& S_ISREG (st.st_mode) && st.st_size != 0
@ -763,7 +763,7 @@ decide_maybe_mmap (_IO_FILE *fp)
file descriptors are for mmap-able objects and on 32-bit
machines we don't want to map files which are too large since
this would require too much virtual memory. */
struct _G_stat64 st;
struct stat64 st;
if (_IO_SYSSTAT (fp, &st) == 0
&& S_ISREG (st.st_mode) && st.st_size != 0
@ -1049,7 +1049,7 @@ _IO_new_file_seekoff (fp, offset, dir, mode)
break;
case _IO_seek_end:
{
struct _G_stat64 st;
struct stat64 st;
if (_IO_SYSSTAT (fp, &st) == 0 && S_ISREG (st.st_mode))
{
offset += st.st_size;
@ -1250,7 +1250,7 @@ _IO_file_stat (fp, st)
void *st;
{
#ifdef _G_FSTAT64
return _G_FSTAT64 (fp->_fileno, (struct _G_stat64 *) st);
return _G_FSTAT64 (fp->_fileno, (struct stat64 *) st);
#else
return fstat (fp->_fileno, (struct stat *) st);
#endif

2
libio/libio.h
View File

@ -37,7 +37,7 @@
#define _IO_size_t size_t
#define _IO_ssize_t __ssize_t
#define _IO_off_t __off_t
#define _IO_off64_t _G_off64_t
#define _IO_off64_t __off64_t
#define _IO_pid_t __pid_t
#define _IO_uid_t __uid_t
#define _IO_iconv_t _G_iconv_t

2
libio/oldfileops.c
View File

@ -530,7 +530,7 @@ _IO_old_file_seekoff (fp, offset, dir, mode)
break;
case _IO_seek_end:
{
struct _G_stat64 st;
struct stat64 st;
if (_IO_SYSSTAT (fp, &st) == 0 && S_ISREG (st.st_mode))
{
offset += st.st_size;

2
libio/wfileops.c
View File

@ -787,7 +787,7 @@ _IO_wfile_seekoff (fp, offset, dir, mode)
break;
case _IO_seek_end:
{
struct _G_stat64 st;
struct stat64 st;
if (_IO_SYSSTAT (fp, &st) == 0 && S_ISREG (st.st_mode))
{
offset += st.st_size;

2
sysdeps/generic/_G_config.h
View File

@ -28,8 +28,6 @@ typedef struct
__off64_t __pos;
__mbstate_t __state;
} _G_fpos64_t;
#define _G_off64_t __off64_t
#define _G_stat64 stat64
#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
# include <gconv.h>
typedef union

2
sysdeps/unix/sysv/linux/_G_config.h
View File

@ -28,8 +28,6 @@ typedef struct
__off64_t __pos;
__mbstate_t __state;
} _G_fpos64_t;
#define _G_off64_t __off64_t
#define _G_stat64 stat64
#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
# include <gconv.h>
typedef union