GNU C Library master sources branch, master, updated. glibc-2.11-121-gdfe11a1

[drepper 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  dfe11a137c2bd33bfe2824a2dc218cf8dbc60aba (commit)
      from  505cf2c00a0b43819f2b90069b42ace79034290d (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=dfe11a137c2bd33bfe2824a2dc218cf8dbc60aba

commit dfe11a137c2bd33bfe2824a2dc218cf8dbc60aba
Author: Ulrich Drepper <drepper@redhat.com>
Date:   Tue Jan 12 20:01:46 2010 -0800

    Fix up grp.h for XPG7.

diff --git a/ChangeLog b/ChangeLog
index ab85512..cd81784 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-01-12  Ulrich Drepper  <drepper@redhat.com>
 
+	* grp/grp.h: Declare getgrent and endgrent for XPG7.
+
+	* conform/data/inttypes.h-data: Use same types as the headers.
+
 	* resolv/netdb.h: Don't define old resolver macros for XPG7.
 
 	* conform/data/sys/uio.h-data: Don't exclude POSIX2008.
diff --git a/conform/data/inttypes.h-data b/conform/data/inttypes.h-data
index 93e4713..17d2b97 100644
--- a/conform/data/inttypes.h-data
+++ b/conform/data/inttypes.h-data
@@ -17,8 +17,8 @@ function intmax_t imaxabs (intmax_t)
 function imaxdiv_t imaxdiv (intmax_t, intmax_t)
 function intmax_t strtoimax (const char*, char**, int)
 function uintmax_t strtoumax (const char*, char**, int)
-function intmax_t wcstoimax (const wchar_t*, wchar_t**, int)
-function uintmax_t wcstoumax (const wchar_t*, wchar_t**, int)
+function intmax_t wcstoimax (const __gwchar_t*, __gwchar_t**, int)
+function uintmax_t wcstoumax (const __gwchar_t*, __gwchar_t**, int)
 
 allow PRI*
 allow SCN*
diff --git a/grp/grp.h b/grp/grp.h
index d7cc69d..c06ef03 100644
--- a/grp/grp.h
+++ b/grp/grp.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991,1992,1995-2001,2003,2004 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1992,1995-2001,2003,2004,2010
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -61,7 +62,10 @@ struct group
    This function is a possible cancellation point and therefore not
    marked with __THROW.  */
 extern void setgrent (void);
+#endif
 
+#if defined __USE_SVID || defined __USE_BSD || defined __USE_XOPEN_EXTENDED \
+    || defined __USE_XOPEN2K8
 /* Close the group-file stream.
 
    This function is a possible cancellation point and therefore not

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

Summary of changes:
 ChangeLog                    |    4 ++++
 conform/data/inttypes.h-data |    4 ++--
 grp/grp.h                    |    6 +++++-
 3 files changed, 11 insertions(+), 3 deletions(-)


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