mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-29 08:11:08 +00:00
498afc54df
This patch cleans up following the obsoletion of _BSD_SOURCE and _SVID_SOURCE by combining __USE_BSD and __USE_SVID into __USE_MISC. The only non-mechanical part of this patch is the changes to features.h; everything else is simple substitution of __USE_MISC for the old macros. Thus, this patch leaves obviously redundant conditionals such as "defined __USE_MISC || defined __USE_MISC", and does not update #endif comments where they referred to BSD or SVID in words instead of the literal macro name. This is intended to facilitate patch review by separating the less mechanical changes from these purely mechanical changes into a separate patch. (I do intend to integrate all the changes from <https://sourceware.org/ml/libc-alpha/2013-12/msg00226.html>, which I believe includes all the trailing comment updates, in subsequent patches.) Tested x86_64. * include/features.h (__USE_BSD): Remove macro definitions. (__USE_SVID): Likewise. (_BSD_SOURCE): Likewise. (_SVID_SOURCE): Likewise. [!defined _BSD_SOURCE && !defined _SVID_SOURCE]: Remove condition from definition of _DEFAULT_SOURCE. [_BSD_SOURCE || _SVID_SOURCE]: Change condition to [_DEFAULT_SOURCE]. * bits/fcntl.h [__USE_BSD]: Change condition to [__USE_MISC]. * bits/mman.h [__USE_BSD]: Likewise. * bits/termios.h [__USE_BSD]: Likewise. * bits/waitstatus.h [__USE_BSD]: Likewise. * ctype/ctype.h [__USE_SVID]: Likewise. * dirent/dirent.h [__USE_BSD]: Likewise. * grp/grp.h [__USE_SVID]: Likewise. [__USE_BSD]: Likewise. * inet/netinet/igmp.h [__USE_BSD]: Likewise. * io/fcntl.h [__USE_BSD]: Likewise. * io/ftw.h [__USE_BSD]: Likewise. * io/sys/stat.h [__USE_BSD]: Likewise. * libio/bits/stdio-ldbl.h [__USE_BSD]: Likewise. * libio/bits/stdio2.h [__USE_BSD]: Likewise. * libio/stdio.h [__USE_SVID]: Likewise. [__USE_BSD]: Likewise. * math/math.h [__USE_SVID]: Likewise. [__USE_BSD]: Likewise. * misc/bits/syslog-ldbl.h [__USE_BSD]: Likewise. * misc/bits/syslog.h [__USE_BSD]: Likewise. * misc/search.h [__USE_SVID]: Likewise. * misc/sys/mman.h [__USE_BSD]: Likewise. * misc/sys/syslog.h [__USE_BSD]: Likewise. * misc/sys/uio.h [__USE_BSD]: Likewise. * posix/bits/unistd.h [__USE_BSD]: Likewise. * posix/glob.h [__USE_BSD]: Likewise. * posix/regex.h [__USE_BSD]: Likewise. * posix/sys/types.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * posix/sys/utsname.h [__USE_SVID]: Likewise. * posix/sys/wait.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * posix/unistd.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * pwd/pwd.h [__USE_SVID]: Likewise. * resolv/netdb.h [__USE_BSD]: Likewise. * setjmp/setjmp.h [__USE_BSD]: Likewise. * signal/signal.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * socket/sys/socket.h [__USE_BSD]: Likewise. * stdlib/fmtmsg.h [__USE_SVID]: Likewise. * stdlib/stdlib.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * string/bits/string2.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * string/bits/string3.h [__USE_BSD]: Likewise. * string/endian.h [__USE_BSD]: Likewise. * string/string.h [__USE_SVID]: Likewise. [__USE_BSD]: Likewise. * string/strings.h [__USE_BSD]: Likewise. * sysdeps/generic/netinet/ip.h [__USE_BSD]: Likewise. * sysdeps/gnu/netinet/ip_icmp.h [__USE_BSD]: Likewise. * sysdeps/mach/hurd/bits/fcntl.h [__USE_BSD]: Likewise. * sysdeps/mach/hurd/bits/stat.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/mman.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/termios.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/bits/fcntl-linux.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/bits/mman-linux.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/bits/sys_errlist.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/bits/termios.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/mips/bits/termios.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/netinet/if_ether.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/netinet/if_fddi.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/netinet/if_tr.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/powerpc/bits/termios.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/termios.h [__USE_BSD]: Likewise. * sysdeps/x86/bits/string.h [__USE_BSD]: Likewise. * sysvipc/sys/ipc.h [__USE_SVID]: Likewise. * termios/termios.h [__USE_BSD]: Likewise. * time/sys/time.h [__USE_BSD]: Likewise. * time/time.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * sysdeps/unix/sysv/linux/hppa/bits/mman.h [__USE_BSD]: Change condition to [__USE_MISC].
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_MISC || 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_MISC || 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
|