mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-09 04:11:27 +08:00
acd7f096d7
This patch completes the headers cleanup consequent on removal of _BSD_SOURCE and _SVID_SOURCE (apart from any subsequent deprecations): * #endif conditionals that referred to BSD or SVID are updated. * Redundant __USE_* tests in cases involving __USE_MISC are removed. This includes cases such as __USE_MISC || __USE_ISOC99, where __USE_MISC is redundant (because __USE_MISC is only ever defined in the default / _DEFAULT_SOURCE / _GNU_SOURCE case, when __USE_ISOC99 is also defined; the same applies to the non-XSI-extended POSIX versions), and cases involving __USE_GNU, where __USE_GNU is redundant (because if __USE_GNU is defined, so are the other __USE_* macros). There may well be other cases of __USE_FOO || __USE_BAR tests that could be simplified because one macro implies the other; this patch only addresses cases involving __USE_MISC. Tested x86_64. * bits/fcntl.h [__USE_MISC]: Remove redundant conditionals. * bits/sigaction.h [__USE_MISC]: Likewise. * bits/waitstatus.h: Update #endif comments. * ctype/ctype.h: Likewise. * dirent/dirent.h: Likewise. [__USE_MISC]: Remove redundant conditionals. * grp/grp.h: Update #endif comments. [__USE_GNU]: Remove redundant conditionals. [__USE_MISC]: Likewise. * inet/netinet/in.h [__USE_GNU]: Likewise. * io/sys/stat.h [__USE_MISC]: Likewise. * libio/bits/stdio-ldbl.h [__USE_MISC]: Likewise. * libio/bits/stdio.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * libio/bits/stdio2.h [__USE_MISC]: Likewise. * libio/stdio.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * math/bits/math-finite.h [__USE_MISC]: Likewise. * math/bits/mathcalls.h [__USE_MISC]: Likewise. * math/math.h: Update #else and #endif comments. [__USE_MISC]: Remove redundant conditionals. * misc/sys/uio.h: Update #endif comments. * posix/bits/unistd.h [__USE_MISC]: Remove redundant conditionals. * posix/glob.h [__USE_MISC]: Likewise. * posix/sys/types.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * posix/sys/wait.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * posix/unistd.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * pwd/pwd.h [__USE_GNU]: Likewise. [__USE_MISC]: Likewise. * resolv/netdb.h [__USE_GNU]: Likewise. * signal/signal.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * stdlib/stdlib.h: Update #else and #endif comments. [__USE_MISC]: Remove redundant conditionals. [__USE_GNU]: Likewise. * string/bits/string2.h [__USE_MISC]: Likewise. * string/string.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * sysdeps/m68k/m680x0/fpu/bits/mathinline.h [__USE_MISC]: Likewise. * sysdeps/mach/hurd/bits/fcntl.h [__USE_MISC]: Likewise. * sysdeps/mach/hurd/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/bits/fcntl-linux.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * sysdeps/unix/sysv/linux/bits/in.h [__USE_GNU]: Likewise. * sysdeps/unix/sysv/linux/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/bits/socket.h [__USE_GNU]: Likewise. * sysdeps/unix/sysv/linux/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/ia64/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/m68k/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/mips/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/mips/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/powerpc/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/s390/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/s390/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/x86/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/x86/bits/string.h: Update #endif comments. * sysdeps/x86/fpu/bits/mathinline.h [__USE_MISC]: Remove redundant conditionals. * time/sys/time.h: Update #endif comments. * time/time.h: Likewise. [__USE_MISC]: Remove redundant conditionals.
192 lines
6.5 KiB
C
192 lines
6.5 KiB
C
/* Copyright (C) 1991-2014 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_TIME_H
|
|
#define _SYS_TIME_H 1
|
|
|
|
#include <features.h>
|
|
|
|
#include <bits/types.h>
|
|
#define __need_time_t
|
|
#include <time.h>
|
|
#define __need_timeval
|
|
#include <bits/time.h>
|
|
|
|
#include <sys/select.h>
|
|
|
|
#ifndef __suseconds_t_defined
|
|
typedef __suseconds_t suseconds_t;
|
|
# define __suseconds_t_defined
|
|
#endif
|
|
|
|
|
|
__BEGIN_DECLS
|
|
|
|
#ifdef __USE_GNU
|
|
/* Macros for converting between `struct timeval' and `struct timespec'. */
|
|
# define TIMEVAL_TO_TIMESPEC(tv, ts) { \
|
|
(ts)->tv_sec = (tv)->tv_sec; \
|
|
(ts)->tv_nsec = (tv)->tv_usec * 1000; \
|
|
}
|
|
# define TIMESPEC_TO_TIMEVAL(tv, ts) { \
|
|
(tv)->tv_sec = (ts)->tv_sec; \
|
|
(tv)->tv_usec = (ts)->tv_nsec / 1000; \
|
|
}
|
|
#endif
|
|
|
|
|
|
#ifdef __USE_MISC
|
|
/* Structure crudely representing a timezone.
|
|
This is obsolete and should never be used. */
|
|
struct timezone
|
|
{
|
|
int tz_minuteswest; /* Minutes west of GMT. */
|
|
int tz_dsttime; /* Nonzero if DST is ever in effect. */
|
|
};
|
|
|
|
typedef struct timezone *__restrict __timezone_ptr_t;
|
|
#else
|
|
typedef void *__restrict __timezone_ptr_t;
|
|
#endif
|
|
|
|
/* Get the current time of day and timezone information,
|
|
putting it into *TV and *TZ. If TZ is NULL, *TZ is not filled.
|
|
Returns 0 on success, -1 on errors.
|
|
NOTE: This form of timezone information is obsolete.
|
|
Use the functions and variables declared in <time.h> instead. */
|
|
extern int gettimeofday (struct timeval *__restrict __tv,
|
|
__timezone_ptr_t __tz) __THROW __nonnull ((1));
|
|
|
|
#ifdef __USE_MISC
|
|
/* Set the current time of day and timezone information.
|
|
This call is restricted to the super-user. */
|
|
extern int settimeofday (const struct timeval *__tv,
|
|
const struct timezone *__tz)
|
|
__THROW;
|
|
|
|
/* Adjust the current time of day by the amount in DELTA.
|
|
If OLDDELTA is not NULL, it is filled in with the amount
|
|
of time adjustment remaining to be done from the last `adjtime' call.
|
|
This call is restricted to the super-user. */
|
|
extern int adjtime (const struct timeval *__delta,
|
|
struct timeval *__olddelta) __THROW;
|
|
#endif
|
|
|
|
|
|
/* Values for the first argument to `getitimer' and `setitimer'. */
|
|
enum __itimer_which
|
|
{
|
|
/* Timers run in real time. */
|
|
ITIMER_REAL = 0,
|
|
#define ITIMER_REAL ITIMER_REAL
|
|
/* Timers run only when the process is executing. */
|
|
ITIMER_VIRTUAL = 1,
|
|
#define ITIMER_VIRTUAL ITIMER_VIRTUAL
|
|
/* Timers run when the process is executing and when
|
|
the system is executing on behalf of the process. */
|
|
ITIMER_PROF = 2
|
|
#define ITIMER_PROF ITIMER_PROF
|
|
};
|
|
|
|
/* Type of the second argument to `getitimer' and
|
|
the second and third arguments `setitimer'. */
|
|
struct itimerval
|
|
{
|
|
/* Value to put into `it_value' when the timer expires. */
|
|
struct timeval it_interval;
|
|
/* Time to the next timer expiration. */
|
|
struct timeval it_value;
|
|
};
|
|
|
|
#if defined __USE_GNU && !defined __cplusplus
|
|
/* Use the nicer parameter type only in GNU mode and not for C++ since the
|
|
strict C++ rules prevent the automatic promotion. */
|
|
typedef enum __itimer_which __itimer_which_t;
|
|
#else
|
|
typedef int __itimer_which_t;
|
|
#endif
|
|
|
|
/* Set *VALUE to the current setting of timer WHICH.
|
|
Return 0 on success, -1 on errors. */
|
|
extern int getitimer (__itimer_which_t __which,
|
|
struct itimerval *__value) __THROW;
|
|
|
|
/* Set the timer WHICH to *NEW. If OLD is not NULL,
|
|
set *OLD to the old value of timer WHICH.
|
|
Returns 0 on success, -1 on errors. */
|
|
extern int setitimer (__itimer_which_t __which,
|
|
const struct itimerval *__restrict __new,
|
|
struct itimerval *__restrict __old) __THROW;
|
|
|
|
/* Change the access time of FILE to TVP[0] and the modification time of
|
|
FILE to TVP[1]. If TVP is a null pointer, use the current time instead.
|
|
Returns 0 on success, -1 on errors. */
|
|
extern int utimes (const char *__file, const struct timeval __tvp[2])
|
|
__THROW __nonnull ((1));
|
|
|
|
#ifdef __USE_MISC
|
|
/* Same as `utimes', but does not follow symbolic links. */
|
|
extern int lutimes (const char *__file, const struct timeval __tvp[2])
|
|
__THROW __nonnull ((1));
|
|
|
|
/* Same as `utimes', but takes an open file descriptor instead of a name. */
|
|
extern int futimes (int __fd, const struct timeval __tvp[2]) __THROW;
|
|
#endif
|
|
|
|
#ifdef __USE_GNU
|
|
/* Change the access time of FILE relative to FD to TVP[0] and the
|
|
modification time of FILE to TVP[1]. If TVP is a null pointer, use
|
|
the current time instead. Returns 0 on success, -1 on errors. */
|
|
extern int futimesat (int __fd, const char *__file,
|
|
const struct timeval __tvp[2]) __THROW;
|
|
#endif
|
|
|
|
|
|
#ifdef __USE_MISC
|
|
/* Convenience macros for operations on timevals.
|
|
NOTE: `timercmp' does not work for >= or <=. */
|
|
# define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec)
|
|
# define timerclear(tvp) ((tvp)->tv_sec = (tvp)->tv_usec = 0)
|
|
# define timercmp(a, b, CMP) \
|
|
(((a)->tv_sec == (b)->tv_sec) ? \
|
|
((a)->tv_usec CMP (b)->tv_usec) : \
|
|
((a)->tv_sec CMP (b)->tv_sec))
|
|
# define timeradd(a, b, result) \
|
|
do { \
|
|
(result)->tv_sec = (a)->tv_sec + (b)->tv_sec; \
|
|
(result)->tv_usec = (a)->tv_usec + (b)->tv_usec; \
|
|
if ((result)->tv_usec >= 1000000) \
|
|
{ \
|
|
++(result)->tv_sec; \
|
|
(result)->tv_usec -= 1000000; \
|
|
} \
|
|
} while (0)
|
|
# define timersub(a, b, result) \
|
|
do { \
|
|
(result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \
|
|
(result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \
|
|
if ((result)->tv_usec < 0) { \
|
|
--(result)->tv_sec; \
|
|
(result)->tv_usec += 1000000; \
|
|
} \
|
|
} while (0)
|
|
#endif /* Misc. */
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* sys/time.h */
|