OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix up sys/types.h for XPG7.

Browse Source 
Also fix a test.
This commit is contained in:
Ulrich Drepper 2010-01-10 07:16:54 -08:00
parent df06f4855e
commit f9cfa295ae
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2010-01-10 Ulrich Drepper <drepper@redhat.com> 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. * string/strings.h: Don't declare obsolete functions for XPG7.
Declare ffs only for XSI. Declare ffs only for XSI.
* conform/data/strings.h-data: Update for XPG7. * conform/data/strings.h-data: Update for XPG7.

1
conform/data/sys/types.h-data
View File

@ -39,7 +39,6 @@ type suseconds_t
type time_t type time_t
type timer_t type timer_t
type uid_t type uid_t
type useconds_t
allow *_t allow *_t
#endif #endif

11
posix/sys/types.h
View File

@ -1,5 +1,4 @@
/* Copyright (C) 1991,1992,1994,1995,1996,1997,1998,1999,2000,2001,2002,2006 /* Copyright (C) 1991,1992,1994-2002,2006,2010 Free Software Foundation, Inc.
Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or 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 # define __pid_t_defined
#endif #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; typedef __id_t id_t;
# define __id_t_defined # define __id_t_defined
#endif #endif
@ -124,7 +124,7 @@ typedef __key_t key_t;
# define __key_t_defined # define __key_t_defined
#endif #endif
#ifdef __USE_XOPEN #if defined __USE_XOPEN || defined __USE_XOPEN2K8
# define __need_clock_t # define __need_clock_t
#endif #endif
#define __need_time_t #define __need_time_t
@ -224,7 +224,8 @@ typedef int register_t __attribute__ ((__mode__ (__word__)));
#endif /* Use BSD. */ #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; typedef __blksize_t blksize_t;
# define __blksize_t_defined # define __blksize_t_defined
#endif #endif