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.
102 lines
3.1 KiB
C
102 lines
3.1 KiB
C
/* -mlong-double-64 compatibility mode for stdio functions.
|
|
Copyright (C) 2006-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 _STDIO_H
|
|
# error "Never include <bits/stdio-ldbl.h> directly; use <stdio.h> instead."
|
|
#endif
|
|
|
|
__BEGIN_NAMESPACE_STD
|
|
__LDBL_REDIR_DECL (fprintf)
|
|
__LDBL_REDIR_DECL (printf)
|
|
__LDBL_REDIR_DECL (sprintf)
|
|
__LDBL_REDIR_DECL (vfprintf)
|
|
__LDBL_REDIR_DECL (vprintf)
|
|
__LDBL_REDIR_DECL (vsprintf)
|
|
#if defined __USE_ISOC99 && !defined __USE_GNU \
|
|
&& !defined __REDIRECT \
|
|
&& (defined __STRICT_ANSI__ || defined __USE_XOPEN2K)
|
|
__LDBL_REDIR1_DECL (fscanf, __nldbl___isoc99_fscanf)
|
|
__LDBL_REDIR1_DECL (scanf, __nldbl___isoc99_scanf)
|
|
__LDBL_REDIR1_DECL (sscanf, __nldbl___isoc99_sscanf)
|
|
#else
|
|
__LDBL_REDIR_DECL (fscanf)
|
|
__LDBL_REDIR_DECL (scanf)
|
|
__LDBL_REDIR_DECL (sscanf)
|
|
#endif
|
|
__END_NAMESPACE_STD
|
|
|
|
#if defined __USE_ISOC99 || defined __USE_UNIX98
|
|
__BEGIN_NAMESPACE_C99
|
|
__LDBL_REDIR_DECL (snprintf)
|
|
__LDBL_REDIR_DECL (vsnprintf)
|
|
__END_NAMESPACE_C99
|
|
#endif
|
|
|
|
#ifdef __USE_ISOC99
|
|
__BEGIN_NAMESPACE_C99
|
|
# if !defined __USE_GNU && !defined __REDIRECT \
|
|
&& (defined __STRICT_ANSI__ || defined __USE_XOPEN2K)
|
|
__LDBL_REDIR1_DECL (vfscanf, __nldbl___isoc99_vfscanf)
|
|
__LDBL_REDIR1_DECL (vscanf, __nldbl___isoc99_vscanf)
|
|
__LDBL_REDIR1_DECL (vsscanf, __nldbl___isoc99_vsscanf)
|
|
# else
|
|
__LDBL_REDIR_DECL (vfscanf)
|
|
__LDBL_REDIR_DECL (vsscanf)
|
|
__LDBL_REDIR_DECL (vscanf)
|
|
# endif
|
|
__END_NAMESPACE_C99
|
|
#endif
|
|
|
|
#ifdef __USE_XOPEN2K8
|
|
__LDBL_REDIR_DECL (vdprintf)
|
|
__LDBL_REDIR_DECL (dprintf)
|
|
#endif
|
|
|
|
#ifdef __USE_GNU
|
|
__LDBL_REDIR_DECL (vasprintf)
|
|
__LDBL_REDIR_DECL (__asprintf)
|
|
__LDBL_REDIR_DECL (asprintf)
|
|
__LDBL_REDIR_DECL (obstack_printf)
|
|
__LDBL_REDIR_DECL (obstack_vprintf)
|
|
#endif
|
|
|
|
#if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function
|
|
__LDBL_REDIR_DECL (__sprintf_chk)
|
|
__LDBL_REDIR_DECL (__vsprintf_chk)
|
|
# if defined __USE_ISOC99 || defined __USE_UNIX98
|
|
__LDBL_REDIR_DECL (__snprintf_chk)
|
|
__LDBL_REDIR_DECL (__vsnprintf_chk)
|
|
# endif
|
|
# if __USE_FORTIFY_LEVEL > 1
|
|
__LDBL_REDIR_DECL (__fprintf_chk)
|
|
__LDBL_REDIR_DECL (__printf_chk)
|
|
__LDBL_REDIR_DECL (__vfprintf_chk)
|
|
__LDBL_REDIR_DECL (__vprintf_chk)
|
|
# ifdef __USE_XOPEN2K8
|
|
__LDBL_REDIR_DECL (__dprintf_chk)
|
|
__LDBL_REDIR_DECL (__vdprintf_chk)
|
|
# endif
|
|
# ifdef __USE_GNU
|
|
__LDBL_REDIR_DECL (__asprintf_chk)
|
|
__LDBL_REDIR_DECL (__vasprintf_chk)
|
|
__LDBL_REDIR_DECL (__obstack_printf_chk)
|
|
__LDBL_REDIR_DECL (__obstack_vprintf_chk)
|
|
# endif
|
|
# endif
|
|
#endif
|