From 05b68e14b146586c46121730241142256f0ef850 Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Wed, 24 Aug 2016 11:54:34 -0400 Subject: Installed-header hygiene (BZ#20366): time.h types. Many headers are expected to expose a subset of the type definitions in time.h. time.h has a whole bunch of messy logic for conditionally defining some its types and structs, but, as best I can tell, this has never worked 100%. In particular, __need_timespec is ineffective if _TIME_H has already been defined, which means that if you compile #include #include with e.g. -fsyntax-only -std=c89 -Wall -Wsystem-headers, you will get In file included from test.c:2:0: /usr/include/sched.h:74:57: warning: "struct timespec" declared inside parameter list will not be visible outside of this definition or declaration extern int sched_rr_get_interval (__pid_t __pid, struct timespec *__t) __THROW; ^~~~~~~~ And if you want to _use_ sched_rr_get_interval in a TU compiled that way, you're hosed. This patch replaces all of that with small bits/types/TYPE.h headers as introduced earlier. time.h and bits/time.h are now *much* simpler, and a lot of other headers are slightly simpler. * time/time.h, bits/time.h, sysdeps/unix/sysv/linux/bits/time.h: Remove all logic conditional on __need macros. Move all the conditionally defined types to their own headers... * time/bits/types/clock_t.h: Define clock_t here. * time/bits/types/clockid_t.h: Define clockid_t here. * time/bits/types/struct_itimerspec.h: Define struct itimerspec here. * time/bits/types/struct_timespec.h: Define struct timespec here. * time/bits/types/struct_timeval.h: Define struct timeval here. * time/bits/types/struct_tm.h: Define struct tm here. * time/bits/types/time_t.h: Define time_t here. * time/bits/types/timer_t.h: Define timer_t here. * time/Makefile: Install the new headers. * bits/resource.h, io/fcntl.h, io/sys/poll.h, io/sys/stat.h * io/utime.h, misc/sys/select.h, posix/sched.h, posix/sys/times.h * posix/sys/types.h, resolv/netdb.h, rt/aio.h, rt/mqueue.h * signal/signal.h, pthread/semaphore.h, sysdeps/nptl/pthread.h * sysdeps/unix/sysv/linux/alpha/bits/resource.h * sysdeps/unix/sysv/linux/alpha/sys/acct.h * sysdeps/unix/sysv/linux/bits/resource.h * sysdeps/unix/sysv/linux/bits/timex.h * sysdeps/unix/sysv/linux/mips/bits/resource.h * sysdeps/unix/sysv/linux/net/ppp_defs.h * sysdeps/unix/sysv/linux/sparc/bits/resource.h * sysdeps/unix/sysv/linux/sys/acct.h * sysdeps/unix/sysv/linux/sys/timerfd.h * sysvipc/sys/msg.h, sysvipc/sys/sem.h, sysvipc/sys/shm.h * time/sys/time.h, time/sys/timeb.h Use the new bits/types headers. * include/time.h: Remove __need logic. * include/bits/time.h * include/bits/types/clock_t.h, include/bits/types/clockid_t.h * include/bits/types/time_t.h, include/bits/types/timer_t.h * include/bits/types/struct_itimerspec.h * include/bits/types/struct_timespec.h * include/bits/types/struct_timeval.h * include/bits/types/struct_tm.h: New wrapper headers. --- io/fcntl.h | 3 +-- io/sys/poll.h | 3 +-- io/sys/stat.h | 13 +++++-------- io/utime.h | 3 +-- 4 files changed, 8 insertions(+), 14 deletions(-) (limited to 'io') diff --git a/io/fcntl.h b/io/fcntl.h index cb706b4..12099a2 100644 --- a/io/fcntl.h +++ b/io/fcntl.h @@ -72,8 +72,7 @@ typedef __pid_t pid_t; /* For XPG all symbols from should also be available. */ #ifdef __USE_XOPEN2K8 -# define __need_timespec -# include +# include #endif #if defined __USE_XOPEN || defined __USE_XOPEN2K8 # include diff --git a/io/sys/poll.h b/io/sys/poll.h index e751860..58498b0 100644 --- a/io/sys/poll.h +++ b/io/sys/poll.h @@ -27,8 +27,7 @@ /* Get the __sigset_t definition. */ # include /* Get the timespec definition. */ -# define __need_timespec -# include +#include #endif diff --git a/io/sys/stat.h b/io/sys/stat.h index 6925f61..71462a7 100644 --- a/io/sys/stat.h +++ b/io/sys/stat.h @@ -26,19 +26,16 @@ #include /* For __mode_t and __dev_t. */ -#if defined __USE_XOPEN || defined __USE_XOPEN2K || defined __USE_ATFILE -# if defined __USE_XOPEN || defined __USE_XOPEN2K -# define __need_time_t -# endif -# ifdef __USE_ATFILE -# define __need_timespec -# endif -# include /* For time_t resp. timespec. */ +#ifdef __USE_ATFILE +# include #endif #if defined __USE_XOPEN || defined __USE_XOPEN2K /* The Single Unix specification says that some more types are available here. */ + +# include + # ifndef __dev_t_defined typedef __dev_t dev_t; # define __dev_t_defined diff --git a/io/utime.h b/io/utime.h index 3cc0d5e..b30e1cc 100644 --- a/io/utime.h +++ b/io/utime.h @@ -29,8 +29,7 @@ __BEGIN_DECLS #include #if defined __USE_XOPEN || defined __USE_XOPEN2K -# define __need_time_t -# include +# include #endif /* Structure describing file times. */ -- cgit v1.1