mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-03 04:01:43 +08:00
05b68e14b1
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.
64 lines
1.8 KiB
C
64 lines
1.8 KiB
C
/* Copyright (C) 1995-2016 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
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef _SYS_SHM_H
|
|
#define _SYS_SHM_H 1
|
|
|
|
#include <features.h>
|
|
|
|
#define __need_size_t
|
|
#include <stddef.h>
|
|
|
|
/* Get common definition of System V style IPC. */
|
|
#include <sys/ipc.h>
|
|
|
|
/* Get system dependent definition of `struct shmid_ds' and more. */
|
|
#include <bits/shm.h>
|
|
|
|
/* Define types required by the standard. */
|
|
#include <bits/types/time_t.h>
|
|
|
|
#ifdef __USE_XOPEN
|
|
# ifndef __pid_t_defined
|
|
typedef __pid_t pid_t;
|
|
# define __pid_t_defined
|
|
# endif
|
|
#endif /* X/Open */
|
|
|
|
|
|
__BEGIN_DECLS
|
|
|
|
/* The following System V style IPC functions implement a shared memory
|
|
facility. The definition is found in XPG4.2. */
|
|
|
|
/* Shared memory control operation. */
|
|
extern int shmctl (int __shmid, int __cmd, struct shmid_ds *__buf) __THROW;
|
|
|
|
/* Get shared memory segment. */
|
|
extern int shmget (key_t __key, size_t __size, int __shmflg) __THROW;
|
|
|
|
/* Attach shared memory segment. */
|
|
extern void *shmat (int __shmid, const void *__shmaddr, int __shmflg)
|
|
__THROW;
|
|
|
|
/* Detach shared memory segment. */
|
|
extern int shmdt (const void *__shmaddr) __THROW;
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* sys/shm.h */
|