This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
GNU C Library master sources branch master updated. glibc-2.16-ports-merge-363-g203e560

From: jsm28 at sourceware dot org
To: glibc-cvs at sourceware dot org
Date: 25 Sep 2012 12:37:53 -0000
Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-363-g203e560
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  203e56032f77d0b36701deaee360e9cdda35d54e (commit)
      from  9fab36eb583c0e585e83a01253299afed9ea9a11 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=203e56032f77d0b36701deaee360e9cdda35d54e

commit 203e56032f77d0b36701deaee360e9cdda35d54e
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Tue Sep 25 12:37:37 2012 +0000

    Remove various _G_*_t type names.

diff --git a/ChangeLog b/ChangeLog
index 46ffa67..cea98d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
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);
diff --git a/sysdeps/generic/_G_config.h b/sysdeps/generic/_G_config.h
index 4c6552f..fc83565 100644
--- a/sysdeps/generic/_G_config.h
+++ b/sysdeps/generic/_G_config.h
@@ -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>
diff --git a/sysdeps/gnu/_G_config.h b/sysdeps/gnu/_G_config.h
index 54f5e55..4d3ae36 100644
--- a/sysdeps/gnu/_G_config.h
+++ b/sysdeps/gnu/_G_config.h
@@ -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>
diff --git a/sysdeps/mach/hurd/_G_config.h b/sysdeps/mach/hurd/_G_config.h
index c7bd8b1..b3a7db7 100644
--- a/sysdeps/mach/hurd/_G_config.h
+++ b/sysdeps/mach/hurd/_G_config.h
@@ -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>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                     |   32 ++++++++++++++++++++++++++++++++
 libio/libio.h                 |   12 ++++++------
 libio/libioP.h                |    4 ++--
 sysdeps/generic/_G_config.h   |    7 -------
 sysdeps/gnu/_G_config.h       |    7 -------
 sysdeps/mach/hurd/_G_config.h |    7 -------
 6 files changed, 40 insertions(+), 29 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]