diff options
author | Zack Weinberg <zackw@panix.com> | 2016-08-24 11:54:34 -0400 |
---|---|---|
committer | Zack Weinberg <zackw@panix.com> | 2016-09-23 08:43:56 -0400 |
commit | 05b68e14b146586c46121730241142256f0ef850 (patch) | |
tree | 678251dbc6c91e596cd49ed80ccaa61f8c072764 /sysvipc | |
parent | f2bea4da2e65b5d91a23a01fb2062bcec33974aa (diff) | |
download | glibc-05b68e14b146586c46121730241142256f0ef850.tar.gz glibc-05b68e14b146586c46121730241142256f0ef850.tar.xz glibc-05b68e14b146586c46121730241142256f0ef850.zip |
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 <time.h> #include <sched.h> 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.
Diffstat (limited to 'sysvipc')
-rw-r--r-- | sysvipc/sys/msg.h | 3 | ||||
-rw-r--r-- | sysvipc/sys/sem.h | 3 | ||||
-rw-r--r-- | sysvipc/sys/shm.h | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/sysvipc/sys/msg.h b/sysvipc/sys/msg.h index 4dc559f49a..4499dc5e91 100644 --- a/sysvipc/sys/msg.h +++ b/sysvipc/sys/msg.h @@ -30,8 +30,7 @@ #include <bits/msq.h> /* Define types required by the standard. */ -#define __need_time_t -#include <time.h> +#include <bits/types/time_t.h> #ifndef __pid_t_defined typedef __pid_t pid_t; diff --git a/sysvipc/sys/sem.h b/sysvipc/sys/sem.h index 1b32092922..3a79f9d27a 100644 --- a/sysvipc/sys/sem.h +++ b/sysvipc/sys/sem.h @@ -30,8 +30,7 @@ #include <bits/sem.h> #ifdef __USE_GNU -# define __need_timespec -# include <time.h> +# include <bits/types/struct_timespec.h> #endif /* The following System V style IPC functions implement a semaphore diff --git a/sysvipc/sys/shm.h b/sysvipc/sys/shm.h index df263dcba6..41dc6c63f7 100644 --- a/sysvipc/sys/shm.h +++ b/sysvipc/sys/shm.h @@ -30,8 +30,7 @@ #include <bits/shm.h> /* Define types required by the standard. */ -#define __need_time_t -#include <time.h> +#include <bits/types/time_t.h> #ifdef __USE_XOPEN # ifndef __pid_t_defined |