GNU C Library master sources branch master updated. glibc-2.16-ports-merge-405-gac51c94

[roland at sourceware dot org]

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  ac51c94918ab4fcd127c2c4b6a269190a6439716 (commit)
      from  28c195f756b734ee92eed9463e440e6bcb85313e (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=ac51c94918ab4fcd127c2c4b6a269190a6439716

commit ac51c94918ab4fcd127c2c4b6a269190a6439716
Author: Roland McGrath <roland@hack.frob.com>
Date:   Fri Sep 28 15:45:07 2012 -0700

    Move _G_config.h with Linuxism to linux/ directory.

diff --git a/ChangeLog b/ChangeLog
index a41982d..4a31c3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2012-09-28  Roland McGrath  <roland@hack.frob.com>
 
+	* sysdeps/gnu/_G_config.h: Moved to ...
+	* sysdeps/unix/sysv/linux/_G_config.h: ... here.
+	* sysdeps/mach/hurd/_G_config.h: Moved to ...
+	* sysdeps/generic/_G_config.h: ... here.
+
 	* io/open.c (__open): Renamed to __libc_open.  Make __open an alias.
 
 	* posix/Makefile ($(objpfx)config-name.h): Do $(make-target-directory).
diff --git a/sysdeps/generic/_G_config.h b/sysdeps/generic/_G_config.h
index fc83565..b3a7db7 100644
--- a/sysdeps/generic/_G_config.h
+++ b/sysdeps/generic/_G_config.h
@@ -28,8 +28,8 @@ typedef struct
   __off64_t __pos;
   __mbstate_t __state;
 } _G_fpos64_t;
-#define _G_off64_t	__off_t
-#define _G_stat64	stat
+#define _G_off64_t	__off64_t
+#define _G_stat64	stat64
 #if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
 # include <gconv.h>
 typedef union
@@ -51,6 +51,11 @@ typedef union
 
 #define _G_IO_IO_FILE_VERSION 0x20001
 
+#define _G_OPEN64	__open64
+#define _G_LSEEK64	__lseek64
+#define _G_MMAP64	__mmap64
+#define _G_FSTAT64(fd,buf) __fxstat64 (_STAT_VER, fd, buf)
+
 /* This is defined by <bits/stat.h> if `st_blksize' exists.  */
 #define _G_HAVE_ST_BLKSIZE defined (_STATBUF_ST_BLKSIZE)
 
diff --git a/sysdeps/mach/hurd/_G_config.h b/sysdeps/mach/hurd/_G_config.h
deleted file mode 100644
index b3a7db7..0000000
--- a/sysdeps/mach/hurd/_G_config.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* This file is needed by libio to define various configuration parameters.
-   These are always the same in the GNU C library.  */
-
-#ifndef _G_config_h
-#define _G_config_h 1
-
-/* Define types for libio in terms of the standard internal type names.  */
-
-#include <bits/types.h>
-#define __need_size_t
-#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
-# define __need_wchar_t
-#endif
-#define __need_NULL
-#include <stddef.h>
-#define __need_mbstate_t
-#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
-# define __need_wint_t
-#endif
-#include <wchar.h>
-typedef struct
-{
-  __off_t __pos;
-  __mbstate_t __state;
-} _G_fpos_t;
-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
-{
-  struct __gconv_info __cd;
-  struct
-  {
-    struct __gconv_info __cd;
-    struct __gconv_step_data __data;
-  } __combined;
-} _G_iconv_t;
-#endif
-
-
-/* These library features are always available in the GNU C library.  */
-#define _G_va_list __gnuc_va_list
-
-#define _G_HAVE_MMAP 1
-
-#define _G_IO_IO_FILE_VERSION 0x20001
-
-#define _G_OPEN64	__open64
-#define _G_LSEEK64	__lseek64
-#define _G_MMAP64	__mmap64
-#define _G_FSTAT64(fd,buf) __fxstat64 (_STAT_VER, fd, buf)
-
-/* This is defined by <bits/stat.h> if `st_blksize' exists.  */
-#define _G_HAVE_ST_BLKSIZE defined (_STATBUF_ST_BLKSIZE)
-
-#define _G_BUFSIZ 8192
-
-#endif	/* _G_config.h */
diff --git a/sysdeps/gnu/_G_config.h b/sysdeps/unix/sysv/linux/_G_config.h
similarity index 100%
rename from sysdeps/gnu/_G_config.h
rename to sysdeps/unix/sysv/linux/_G_config.h

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

Summary of changes:
 ChangeLog                                    |    5 ++
 sysdeps/generic/_G_config.h                  |    9 +++-
 sysdeps/mach/hurd/_G_config.h                |   64 --------------------------
 sysdeps/{gnu => unix/sysv/linux}/_G_config.h |    0
 4 files changed, 12 insertions(+), 66 deletions(-)
 delete mode 100644 sysdeps/mach/hurd/_G_config.h
 rename sysdeps/{gnu => unix/sysv/linux}/_G_config.h (100%)


hooks/post-receive
-- 
GNU C Library master sources