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. --- include/bits/types/struct_timeval.h | 1 + 1 file changed, 1 insertion(+) create mode 100644 include/bits/types/struct_timeval.h (limited to 'include/bits/types/struct_timeval.h') diff --git a/include/bits/types/struct_timeval.h b/include/bits/types/struct_timeval.h new file mode 100644 index 0000000000..5d2cb78259 --- /dev/null +++ b/include/bits/types/struct_timeval.h @@ -0,0 +1 @@ +#include "../../time/bits/types/struct_timeval.h" -- cgit v1.2.3 From 81df4d253dc3184fb003e4737b917e8d35c341d1 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 7 Jun 2017 17:59:50 +0000 Subject: Fix include paths in include/bits/types/*.h. Various include/bits/types/*.h files do where the path specified is relative to the toplevel glibc source directory. That has the wrong number of ../ components to achieve the desired effect; it actually searches relative to include/ for a file that does not exist there, then goes on to search the #include <> paths specified with -I, eventually finding the desired file via such a path (e.g. sysdeps/nptl/) with the right number of directory components. Before that it searches include/../.. because of the -Iinclude, meaning that an appropriately named file outside the glibc source tree can affect the build. This patch changes all those files to do #include without the ../../, as some such files already do. Tested for x86_64. * include/bits/types/clock_t.h: Use #include instead of #include "../../path". * include/bits/types/clockid_t.h: Likewise. * include/bits/types/struct_iovec.h: Likewise. * include/bits/types/struct_itimerspec.h: Likewise. * include/bits/types/struct_osockaddr.h: Likewise. * include/bits/types/struct_sigstack.h: Likewise. * include/bits/types/struct_timespec.h: Likewise. * include/bits/types/struct_timeval.h: Likewise. * include/bits/types/struct_tm.h: Likewise. * include/bits/types/time_t.h: Likewise. * include/bits/types/timer_t.h: Likewise. --- ChangeLog | 13 +++++++++++++ include/bits/types/clock_t.h | 2 +- include/bits/types/clockid_t.h | 2 +- include/bits/types/struct_iovec.h | 2 +- include/bits/types/struct_itimerspec.h | 2 +- include/bits/types/struct_osockaddr.h | 2 +- include/bits/types/struct_sigstack.h | 2 +- include/bits/types/struct_timespec.h | 2 +- include/bits/types/struct_timeval.h | 2 +- include/bits/types/struct_tm.h | 2 +- include/bits/types/time_t.h | 2 +- include/bits/types/timer_t.h | 2 +- 12 files changed, 24 insertions(+), 11 deletions(-) (limited to 'include/bits/types/struct_timeval.h') diff --git a/ChangeLog b/ChangeLog index b9c7e28f4c..e571155927 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,18 @@ 2017-06-07 Joseph Myers + * include/bits/types/clock_t.h: Use #include instead of + #include "../../path". + * include/bits/types/clockid_t.h: Likewise. + * include/bits/types/struct_iovec.h: Likewise. + * include/bits/types/struct_itimerspec.h: Likewise. + * include/bits/types/struct_osockaddr.h: Likewise. + * include/bits/types/struct_sigstack.h: Likewise. + * include/bits/types/struct_timespec.h: Likewise. + * include/bits/types/struct_timeval.h: Likewise. + * include/bits/types/struct_tm.h: Likewise. + * include/bits/types/time_t.h: Likewise. + * include/bits/types/timer_t.h: Likewise. + [BZ #14096] * timezone/Makefile ($(objpfx)tst-timezone.out): Depend on America/New_York. diff --git a/include/bits/types/clock_t.h b/include/bits/types/clock_t.h index a08940dbef..4cfe8e7e8b 100644 --- a/include/bits/types/clock_t.h +++ b/include/bits/types/clock_t.h @@ -1 +1 @@ -#include "../../time/bits/types/clock_t.h" +#include