From 203e56032f77d0b36701deaee360e9cdda35d54e Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Tue, 25 Sep 2012 12:37:37 +0000 Subject: Remove various _G_*_t type names. --- libio/libio.h | 12 ++++++------ libio/libioP.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'libio') diff --git a/libio/libio.h b/libio/libio.h index b737cec..f093a93 100644 --- a/libio/libio.h +++ b/libio/libio.h @@ -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 diff --git a/libio/libioP.h b/libio/libioP.h index 01e8bf8..a280052 100644 --- a/libio/libioP.h +++ b/libio/libioP.h @@ -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); -- cgit v1.1