From 50e16f851971fa313a0ab870e3874a3df9314666 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 19 Jul 2007 17:21:02 +0000 Subject: [PATCH] * bits/types.h: Don't include stddef.h, don't define __need_size_t. * signal/signal.h <__USE_BSD || __USE_XOPEN_EXTENDED>: Define __need_size_t and include stddef.h. * sysvipc/sys/msg.h: Likewise. * posix/sched.h: Likewise. * hurd/hurd/signal.h (__need_size_t): Define. * CONFORMANCE: ctype.h and wctype.h no longer define size_t, neither does signal.h in pedantic ISO C namespaces. stdio.h no longer defines wint_t or wchar_t. --- CONFORMANCE | 8 -------- ChangeLog | 11 +++++++++++ bits/types.h | 5 +---- hurd/hurd/signal.h | 1 + posix/sched.h | 3 +++ signal/signal.h | 4 +++- sysvipc/sys/msg.h | 6 +++++- 7 files changed, 24 insertions(+), 14 deletions(-) diff --git a/CONFORMANCE b/CONFORMANCE index 012a487a95..92ab7b7f52 100644 --- a/CONFORMANCE +++ b/CONFORMANCE @@ -184,15 +184,7 @@ Also, the Single Unix Specification generally requires more types to be included in headers (if _XOPEN_SOURCE is defined appropriately) than ISO C permits. - should not declare size_t. - - should not declare size_t. - - should not declare or use wchar_t or wint_t. - does not support AMD1; to support it, the functions fwprintf, fwscanf, wprintf, wscanf, swprintf, swscanf, vfwprintf, vwprintf, vswprintf and fwide would need to be declared when __STDC_VERSION__ >= 199409L and not just for C99. - - should not declare size_t. diff --git a/ChangeLog b/ChangeLog index 208ca7e068..acf2c4fea8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ 2007-07-17 Jakub Jelinek + * bits/types.h: Don't include stddef.h, don't define __need_size_t. + * signal/signal.h <__USE_BSD || __USE_XOPEN_EXTENDED>: Define + __need_size_t and include stddef.h. + * sysvipc/sys/msg.h: Likewise. + * posix/sched.h: Likewise. + * hurd/hurd/signal.h (__need_size_t): Define. + + * CONFORMANCE: ctype.h and wctype.h no longer define size_t, + neither does signal.h in pedantic ISO C namespaces. stdio.h + no longer defines wint_t or wchar_t. + * libio/libioP.h (_IO_acquire_lock_clear_flags2_fct): New function. * debug/vfwprintf_chk.c (__vfwprintf_chk): Use _IO_acquire_lock_clear_flags2 instead of _IO_acquire_lock. diff --git a/bits/types.h b/bits/types.h index 65c8a9fe90..3ebe82f058 100644 --- a/bits/types.h +++ b/bits/types.h @@ -1,5 +1,5 @@ /* bits/types.h -- definitions of __*_t types underlying *_t types. - Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2007 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 @@ -27,9 +27,6 @@ #include #include -#define __need_size_t -#include - /* Convenience types. */ typedef unsigned char __u_char; typedef unsigned short int __u_short; diff --git a/hurd/hurd/signal.h b/hurd/hurd/signal.h index c5b04f434c..39fa0f857c 100644 --- a/hurd/hurd/signal.h +++ b/hurd/hurd/signal.h @@ -26,6 +26,7 @@ #error "Must have `_GNU_SOURCE' feature test macro to use this file" #endif +#define __need_size_t #define __need_NULL #include diff --git a/posix/sched.h b/posix/sched.h index becad0f365..62cca85b2e 100644 --- a/posix/sched.h +++ b/posix/sched.h @@ -25,6 +25,9 @@ /* Get type definitions. */ #include +#define __need_size_t +#include + #define __need_timespec #include diff --git a/signal/signal.h b/signal/signal.h index ed39328efb..aa210374db 100644 --- a/signal/signal.h +++ b/signal/signal.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 1991-2003, 2004, 2007 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 @@ -339,6 +339,8 @@ extern int sigreturn (struct sigcontext *__scp) __THROW; #if defined __USE_BSD || defined __USE_XOPEN_EXTENDED +# define __need_size_t +# include /* If INTERRUPT is nonzero, make signal SIG interrupt system calls (causing them to fail with EINTR); if INTERRUPT is zero, make system diff --git a/sysvipc/sys/msg.h b/sysvipc/sys/msg.h index b22c07678a..cdc96be9b7 100644 --- a/sysvipc/sys/msg.h +++ b/sysvipc/sys/msg.h @@ -1,4 +1,5 @@ -/* Copyright (C) 1995-1997,1999,2000,2003,2006 Free Software Foundation, Inc. +/* Copyright (C) 1995-1997,1999,2000,2003,2006,2007 + 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 @@ -21,6 +22,9 @@ #include +#define __need_size_t +#include + /* Get common definition of System V style IPC. */ #include