mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 07:10:06 +00: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.
79 lines
2.6 KiB
C
79 lines
2.6 KiB
C
/* Compatibility definitions for System V `poll' interface.
|
|
Copyright (C) 1994-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_POLL_H
|
|
#define _SYS_POLL_H 1
|
|
|
|
#include <features.h>
|
|
|
|
/* Get the platform dependent bits of `poll'. */
|
|
#include <bits/poll.h>
|
|
#ifdef __USE_GNU
|
|
/* Get the __sigset_t definition. */
|
|
# include <bits/sigset.h>
|
|
/* Get the timespec definition. */
|
|
#include <bits/types/struct_timespec.h>
|
|
#endif
|
|
|
|
|
|
/* Type used for the number of file descriptors. */
|
|
typedef unsigned long int nfds_t;
|
|
|
|
/* Data structure describing a polling request. */
|
|
struct pollfd
|
|
{
|
|
int fd; /* File descriptor to poll. */
|
|
short int events; /* Types of events poller cares about. */
|
|
short int revents; /* Types of events that actually occurred. */
|
|
};
|
|
|
|
|
|
__BEGIN_DECLS
|
|
|
|
/* Poll the file descriptors described by the NFDS structures starting at
|
|
FDS. If TIMEOUT is nonzero and not -1, allow TIMEOUT milliseconds for
|
|
an event to occur; if TIMEOUT is -1, block until an event occurs.
|
|
Returns the number of file descriptors with events, zero if timed out,
|
|
or -1 for errors.
|
|
|
|
This function is a cancellation point and therefore not marked with
|
|
__THROW. */
|
|
extern int poll (struct pollfd *__fds, nfds_t __nfds, int __timeout);
|
|
|
|
#ifdef __USE_GNU
|
|
/* Like poll, but before waiting the threads signal mask is replaced
|
|
with that specified in the fourth parameter. For better usability,
|
|
the timeout value is specified using a TIMESPEC object.
|
|
|
|
This function is a cancellation point and therefore not marked with
|
|
__THROW. */
|
|
extern int ppoll (struct pollfd *__fds, nfds_t __nfds,
|
|
const struct timespec *__timeout,
|
|
const __sigset_t *__ss);
|
|
#endif
|
|
|
|
__END_DECLS
|
|
|
|
|
|
/* Define some inlines helping to catch common problems. */
|
|
#if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function
|
|
# include <bits/poll2.h>
|
|
#endif
|
|
|
|
#endif /* sys/poll.h */
|