Fix up grp.h for XPG7.

diff --git a/ChangeLog b/ChangeLog
index ab85512..cd81784 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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