mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-21 04:31:04 +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.
123 lines
4.6 KiB
C
123 lines
4.6 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_UIO_H
|
|
#define _SYS_UIO_H 1
|
|
|
|
#include <features.h>
|
|
|
|
#include <sys/types.h>
|
|
|
|
__BEGIN_DECLS
|
|
|
|
/* This file defines `struct iovec'. */
|
|
#include <bits/uio.h>
|
|
|
|
|
|
/* Read data from file descriptor FD, and put the result in the
|
|
buffers described by IOVEC, which is a vector of COUNT 'struct iovec's.
|
|
The buffers are filled in the order specified.
|
|
Operates just like 'read' (see <unistd.h>) except that data are
|
|
put in IOVEC instead of a contiguous buffer.
|
|
|
|
This function is a cancellation point and therefore not marked with
|
|
__THROW. */
|
|
extern ssize_t readv (int __fd, const struct iovec *__iovec, int __count)
|
|
__wur;
|
|
|
|
/* Write data pointed by the buffers described by IOVEC, which
|
|
is a vector of COUNT 'struct iovec's, to file descriptor FD.
|
|
The data is written in the order specified.
|
|
Operates just like 'write' (see <unistd.h>) except that the data
|
|
are taken from IOVEC instead of a contiguous buffer.
|
|
|
|
This function is a cancellation point and therefore not marked with
|
|
__THROW. */
|
|
extern ssize_t writev (int __fd, const struct iovec *__iovec, int __count)
|
|
__wur;
|
|
|
|
|
|
#ifdef __USE_MISC
|
|
# ifndef __USE_FILE_OFFSET64
|
|
/* Read data from file descriptor FD at the given position OFFSET
|
|
without change the file pointer, and put the result in the buffers
|
|
described by IOVEC, which is a vector of COUNT 'struct iovec's.
|
|
The buffers are filled in the order specified. Operates just like
|
|
'pread' (see <unistd.h>) except that data are put in IOVEC instead
|
|
of a contiguous buffer.
|
|
|
|
This function is a cancellation point and therefore not marked with
|
|
__THROW. */
|
|
extern ssize_t preadv (int __fd, const struct iovec *__iovec, int __count,
|
|
__off_t __offset) __wur;
|
|
|
|
/* Write data pointed by the buffers described by IOVEC, which is a
|
|
vector of COUNT 'struct iovec's, to file descriptor FD at the given
|
|
position OFFSET without change the file pointer. The data is
|
|
written in the order specified. Operates just like 'pwrite' (see
|
|
<unistd.h>) except that the data are taken from IOVEC instead of a
|
|
contiguous buffer.
|
|
|
|
This function is a cancellation point and therefore not marked with
|
|
__THROW. */
|
|
extern ssize_t pwritev (int __fd, const struct iovec *__iovec, int __count,
|
|
__off_t __offset) __wur;
|
|
# else
|
|
# ifdef __REDIRECT
|
|
extern ssize_t __REDIRECT (preadv, (int __fd, const struct iovec *__iovec,
|
|
int __count, __off64_t __offset),
|
|
preadv64) __wur;
|
|
extern ssize_t __REDIRECT (pwritev, (int __fd, const struct iovec *__iovec,
|
|
int __count, __off64_t __offset),
|
|
pwritev64) __wur;
|
|
# else
|
|
# define preadv preadv64
|
|
# define pwritev pwritev64
|
|
# endif
|
|
# endif
|
|
|
|
# ifdef __USE_LARGEFILE64
|
|
/* Read data from file descriptor FD at the given position OFFSET
|
|
without change the file pointer, and put the result in the buffers
|
|
described by IOVEC, which is a vector of COUNT 'struct iovec's.
|
|
The buffers are filled in the order specified. Operates just like
|
|
'pread' (see <unistd.h>) except that data are put in IOVEC instead
|
|
of a contiguous buffer.
|
|
|
|
This function is a cancellation point and therefore not marked with
|
|
__THROW. */
|
|
extern ssize_t preadv64 (int __fd, const struct iovec *__iovec, int __count,
|
|
__off64_t __offset) __wur;
|
|
|
|
/* Write data pointed by the buffers described by IOVEC, which is a
|
|
vector of COUNT 'struct iovec's, to file descriptor FD at the given
|
|
position OFFSET without change the file pointer. The data is
|
|
written in the order specified. Operates just like 'pwrite' (see
|
|
<unistd.h>) except that the data are taken from IOVEC instead of a
|
|
contiguous buffer.
|
|
|
|
This function is a cancellation point and therefore not marked with
|
|
__THROW. */
|
|
extern ssize_t pwritev64 (int __fd, const struct iovec *__iovec, int __count,
|
|
__off64_t __offset) __wur;
|
|
# endif
|
|
#endif /* Use misc. */
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* sys/uio.h */
|