diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2010-01-12 20:01:46 -0800 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2010-01-12 20:01:46 -0800 |
| commit | dfe11a137c2bd33bfe2824a2dc218cf8dbc60aba (patch) | |
| tree | ac5b4c546637c0335ecbf7ff1933f186aaad895b | |
| parent | 505cf2c00a0b43819f2b90069b42ace79034290d (diff) | |
| download | glibc-dfe11a137c2bd33bfe2824a2dc218cf8dbc60aba.tar.gz glibc-dfe11a137c2bd33bfe2824a2dc218cf8dbc60aba.tar.xz glibc-dfe11a137c2bd33bfe2824a2dc218cf8dbc60aba.zip | |
Fix up grp.h for XPG7.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | conform/data/inttypes.h-data | 4 | ||||
| -rw-r--r-- | grp/grp.h | 6 |
3 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index ab85512a4a..cd8178494f 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 93e4713c95..17d2b9717a 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 d7cc69d0eb..c06ef03ae6 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 |