picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove various _G_*_t type names.

Browse source
This commit is contained in:
Joseph Myers 2012-09-25 12:37:37 +00:00
parent 9fab36eb58
commit 203e56032f
6 changed files with 40 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
ChangeLog
View file

@ -1,3 +1,35 @@
2012-09-25 Joseph Myers <joseph@codesourcery.com>
* libio/libio.h (_IO_size_t): Define to size_t, not _G_size_t.
(_IO_ssize_t): Define to __ssize_t, not _G_ssize_t.
(_IO_off_t): Define to __off_t, not _G_off_t.
(_IO_pid_t): Define to __pid_t, not _G_pid_t.
(_IO_uid_t): Define to __uid_t, not _G_uid_t.
(_IO_wint_t): Define to wint_t, not _G_wint_t.
* libio/libioP.h (struct _IO_jump_t): Use size_t not _G_size_t as
type of __dummy and __dummy2 fields.
* sysdeps/generic/_G_config.h (_G_size_t): Remove.
(_G_ssize_t): Likewise.
(_G_off_t): Likewise.
(_G_pid_t): Likewise.
(_G_uid_t): Likewise.
(_G_wchar_t): Likewise.
(_G_wint_t): Likewise.
* sysdeps/gnu/_G_config.h (_G_size_t): Remove.
(_G_ssize_t): Likewise.
(_G_off_t): Likewise.
(_G_pid_t): Likewise.
(_G_uid_t): Likewise.
(_G_wchar_t): Likewise.
(_G_wint_t): Likewise.
* sysdeps/mach/hurd/_G_config.h (_G_size_t): Remove.
(_G_ssize_t): Likewise.
(_G_off_t): Likewise.
(_G_pid_t): Likewise.
(_G_uid_t): Likewise.
(_G_wchar_t): Likewise.
(_G_wint_t): Likewise.
2012-09-25 Siddhesh Poyarekar <siddhesh@redhat.com>
* malloc/arena.c: Include malloc-sysdep.h.

12
libio/libio.h
View file

@ -34,17 +34,17 @@
#define _IO_pos_t _G_fpos_t /* obsolete */
#define _IO_fpos_t _G_fpos_t
#define _IO_fpos64_t _G_fpos64_t
#define _IO_size_t _G_size_t
#define _IO_ssize_t _G_ssize_t
#define _IO_off_t _G_off_t
#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_pid_t _G_pid_t
#define _IO_uid_t _G_uid_t
#define _IO_pid_t __pid_t
#define _IO_uid_t __uid_t
#define _IO_iconv_t _G_iconv_t
#define _IO_HAVE_ST_BLKSIZE _G_HAVE_ST_BLKSIZE
#define _IO_BUFSIZ _G_BUFSIZ
#define _IO_va_list _G_va_list
#define _IO_wint_t _G_wint_t
#define _IO_wint_t wint_t
/* This define avoids name pollution if we're using GNU stdarg.h */
#define __need___va_list

4
libio/libioP.h
View file

@ -282,8 +282,8 @@ typedef void (*_IO_imbue_t) (_IO_FILE *, void *);
struct _IO_jump_t
{
JUMP_FIELD(_G_size_t, __dummy);
JUMP_FIELD(_G_size_t, __dummy2);
JUMP_FIELD(size_t, __dummy);
JUMP_FIELD(size_t, __dummy2);
JUMP_FIELD(_IO_finish_t, __finish);
JUMP_FIELD(_IO_overflow_t, __overflow);
JUMP_FIELD(_IO_underflow_t, __underflow);

7
sysdeps/generic/_G_config.h
View file

@ -18,7 +18,6 @@
# define __need_wint_t
#endif
#include <wchar.h>
#define _G_size_t size_t
typedef struct
{
__off_t __pos;
@ -29,13 +28,7 @@ typedef struct
__off64_t __pos;
__mbstate_t __state;
} _G_fpos64_t;
#define _G_ssize_t __ssize_t
#define _G_off_t __off_t
#define _G_off64_t __off_t
#define _G_pid_t __pid_t
#define _G_uid_t __uid_t
#define _G_wchar_t wchar_t
#define _G_wint_t wint_t
#define _G_stat64 stat
#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
# include <gconv.h>

7
sysdeps/gnu/_G_config.h
View file

@ -18,7 +18,6 @@
# define __need_wint_t
#endif
#include <wchar.h>
#define _G_size_t size_t
typedef struct
{
__off_t __pos;
@ -29,13 +28,7 @@ typedef struct
__off64_t __pos;
__mbstate_t __state;
} _G_fpos64_t;
#define _G_ssize_t __ssize_t
#define _G_off_t __off_t
#define _G_off64_t __off64_t
#define _G_pid_t __pid_t
#define _G_uid_t __uid_t
#define _G_wchar_t wchar_t
#define _G_wint_t wint_t
#define _G_stat64 stat64
#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
# include <gconv.h>

7
sysdeps/mach/hurd/_G_config.h
View file

@ -18,7 +18,6 @@
# define __need_wint_t
#endif
#include <wchar.h>
#define _G_size_t size_t
typedef struct
{
__off_t __pos;
@ -29,13 +28,7 @@ typedef struct
__off64_t __pos;
__mbstate_t __state;
} _G_fpos64_t;
#define _G_ssize_t __ssize_t
#define _G_off_t __off_t
#define _G_off64_t __off64_t
#define _G_pid_t __pid_t
#define _G_uid_t __uid_t
#define _G_wchar_t wchar_t
#define _G_wint_t wint_t
#define _G_stat64 stat64
#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
# include <gconv.h>