diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2010-01-10 07:16:54 -0800 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2010-01-10 07:16:54 -0800 |
| commit | f9cfa295ae3f2556bd8808f0ff693cfe44f4ac25 (patch) | |
| tree | 908778f05f67322eb22c8d5dd8848aee4b4791d1 | |
| parent | df06f4855e94542fd69d920f2ddfb39275993f94 (diff) | |
| download | glibc-f9cfa295ae3f2556bd8808f0ff693cfe44f4ac25.tar.gz glibc-f9cfa295ae3f2556bd8808f0ff693cfe44f4ac25.tar.xz glibc-f9cfa295ae3f2556bd8808f0ff693cfe44f4ac25.zip | |
Fix up sys/types.h for XPG7.
Also fix a test.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | conform/data/sys/types.h-data | 1 | ||||
| -rw-r--r-- | posix/sys/types.h | 11 |
3 files changed, 8 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 1d91788ba2..1410b79e30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2010-01-10 Ulrich Drepper <drepper@redhat.com> + * posix/sys/types.h: Define id_t, clock_t, blksize_t for XPG7. + * string/strings.h: Don't declare obsolete functions for XPG7. Declare ffs only for XSI. * conform/data/strings.h-data: Update for XPG7. diff --git a/conform/data/sys/types.h-data b/conform/data/sys/types.h-data index be61d08751..c0b4ab73ee 100644 --- a/conform/data/sys/types.h-data +++ b/conform/data/sys/types.h-data @@ -39,7 +39,6 @@ type suseconds_t type time_t type timer_t type uid_t -type useconds_t allow *_t #endif diff --git a/posix/sys/types.h b/posix/sys/types.h index 04563a4abc..a7e9084e2e 100644 --- a/posix/sys/types.h +++ b/posix/sys/types.h @@ -1,5 +1,4 @@ -/* Copyright (C) 1991,1992,1994,1995,1996,1997,1998,1999,2000,2001,2002,2006 - Free Software Foundation, Inc. +/* Copyright (C) 1991,1992,1994-2002,2006,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 @@ -101,7 +100,8 @@ typedef __pid_t pid_t; # define __pid_t_defined #endif -#if (defined __USE_SVID || defined __USE_XOPEN) && !defined __id_t_defined +#if (defined __USE_SVID || defined __USE_XOPEN || defined __USE_XOPEN2K8) \ + && !defined __id_t_defined typedef __id_t id_t; # define __id_t_defined #endif @@ -124,7 +124,7 @@ typedef __key_t key_t; # define __key_t_defined #endif -#ifdef __USE_XOPEN +#if defined __USE_XOPEN || defined __USE_XOPEN2K8 # define __need_clock_t #endif #define __need_time_t @@ -224,7 +224,8 @@ typedef int register_t __attribute__ ((__mode__ (__word__))); #endif /* Use BSD. */ -#if defined __USE_UNIX98 && !defined __blksize_t_defined +#if (defined __USE_UNIX98 || defined __USE_XOPEN2K8) \ + && !defined __blksize_t_defined typedef __blksize_t blksize_t; # define __blksize_t_defined #endif |