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].
276 lines
6.6 KiB
C
276 lines
6.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/>. */
|
|
|
|
/*
|
|
* POSIX Standard: 2.6 Primitive System Data Types <sys/types.h>
|
|
*/
|
|
|
|
#ifndef _SYS_TYPES_H
|
|
#define _SYS_TYPES_H 1
|
|
|
|
#include <features.h>
|
|
|
|
__BEGIN_DECLS
|
|
|
|
#include <bits/types.h>
|
|
|
|
#ifdef __USE_MISC
|
|
# ifndef __u_char_defined
|
|
typedef __u_char u_char;
|
|
typedef __u_short u_short;
|
|
typedef __u_int u_int;
|
|
typedef __u_long u_long;
|
|
typedef __quad_t quad_t;
|
|
typedef __u_quad_t u_quad_t;
|
|
typedef __fsid_t fsid_t;
|
|
# define __u_char_defined
|
|
# endif
|
|
#endif
|
|
|
|
typedef __loff_t loff_t;
|
|
|
|
#ifndef __ino_t_defined
|
|
# ifndef __USE_FILE_OFFSET64
|
|
typedef __ino_t ino_t;
|
|
# else
|
|
typedef __ino64_t ino_t;
|
|
# endif
|
|
# define __ino_t_defined
|
|
#endif
|
|
#if defined __USE_LARGEFILE64 && !defined __ino64_t_defined
|
|
typedef __ino64_t ino64_t;
|
|
# define __ino64_t_defined
|
|
#endif
|
|
|
|
#ifndef __dev_t_defined
|
|
typedef __dev_t dev_t;
|
|
# define __dev_t_defined
|
|
#endif
|
|
|
|
#ifndef __gid_t_defined
|
|
typedef __gid_t gid_t;
|
|
# define __gid_t_defined
|
|
#endif
|
|
|
|
#ifndef __mode_t_defined
|
|
typedef __mode_t mode_t;
|
|
# define __mode_t_defined
|
|
#endif
|
|
|
|
#ifndef __nlink_t_defined
|
|
typedef __nlink_t nlink_t;
|
|
# define __nlink_t_defined
|
|
#endif
|
|
|
|
#ifndef __uid_t_defined
|
|
typedef __uid_t uid_t;
|
|
# define __uid_t_defined
|
|
#endif
|
|
|
|
#ifndef __off_t_defined
|
|
# ifndef __USE_FILE_OFFSET64
|
|
typedef __off_t off_t;
|
|
# else
|
|
typedef __off64_t off_t;
|
|
# endif
|
|
# define __off_t_defined
|
|
#endif
|
|
#if defined __USE_LARGEFILE64 && !defined __off64_t_defined
|
|
typedef __off64_t off64_t;
|
|
# define __off64_t_defined
|
|
#endif
|
|
|
|
#ifndef __pid_t_defined
|
|
typedef __pid_t pid_t;
|
|
# define __pid_t_defined
|
|
#endif
|
|
|
|
#if (defined __USE_MISC || defined __USE_XOPEN || defined __USE_XOPEN2K8) \
|
|
&& !defined __id_t_defined
|
|
typedef __id_t id_t;
|
|
# define __id_t_defined
|
|
#endif
|
|
|
|
#ifndef __ssize_t_defined
|
|
typedef __ssize_t ssize_t;
|
|
# define __ssize_t_defined
|
|
#endif
|
|
|
|
#ifdef __USE_MISC
|
|
# ifndef __daddr_t_defined
|
|
typedef __daddr_t daddr_t;
|
|
typedef __caddr_t caddr_t;
|
|
# define __daddr_t_defined
|
|
# endif
|
|
#endif
|
|
|
|
#if (defined __USE_MISC || defined __USE_XOPEN) && !defined __key_t_defined
|
|
typedef __key_t key_t;
|
|
# define __key_t_defined
|
|
#endif
|
|
|
|
#if defined __USE_XOPEN || defined __USE_XOPEN2K8
|
|
# define __need_clock_t
|
|
#endif
|
|
#define __need_time_t
|
|
#define __need_timer_t
|
|
#define __need_clockid_t
|
|
#include <time.h>
|
|
|
|
#ifdef __USE_XOPEN
|
|
# ifndef __useconds_t_defined
|
|
typedef __useconds_t useconds_t;
|
|
# define __useconds_t_defined
|
|
# endif
|
|
# ifndef __suseconds_t_defined
|
|
typedef __suseconds_t suseconds_t;
|
|
# define __suseconds_t_defined
|
|
# endif
|
|
#endif
|
|
|
|
#define __need_size_t
|
|
#include <stddef.h>
|
|
|
|
#ifdef __USE_MISC
|
|
/* Old compatibility names for C types. */
|
|
typedef unsigned long int ulong;
|
|
typedef unsigned short int ushort;
|
|
typedef unsigned int uint;
|
|
#endif
|
|
|
|
/* These size-specific names are used by some of the inet code. */
|
|
|
|
#if !__GNUC_PREREQ (2, 7)
|
|
|
|
/* These types are defined by the ISO C99 header <inttypes.h>. */
|
|
# ifndef __int8_t_defined
|
|
# define __int8_t_defined
|
|
typedef char int8_t;
|
|
typedef short int int16_t;
|
|
typedef int int32_t;
|
|
# if __WORDSIZE == 64
|
|
typedef long int int64_t;
|
|
# else
|
|
__extension__ typedef long long int int64_t;
|
|
# endif
|
|
# endif
|
|
|
|
/* But these were defined by ISO C without the first `_'. */
|
|
typedef unsigned char u_int8_t;
|
|
typedef unsigned short int u_int16_t;
|
|
typedef unsigned int u_int32_t;
|
|
# if __WORDSIZE == 64
|
|
typedef unsigned long int u_int64_t;
|
|
# else
|
|
__extension__ typedef unsigned long long int u_int64_t;
|
|
# endif
|
|
|
|
typedef int register_t;
|
|
|
|
#else
|
|
|
|
/* For GCC 2.7 and later, we can use specific type-size attributes. */
|
|
# define __intN_t(N, MODE) \
|
|
typedef int int##N##_t __attribute__ ((__mode__ (MODE)))
|
|
# define __u_intN_t(N, MODE) \
|
|
typedef unsigned int u_int##N##_t __attribute__ ((__mode__ (MODE)))
|
|
|
|
# ifndef __int8_t_defined
|
|
# define __int8_t_defined
|
|
__intN_t (8, __QI__);
|
|
__intN_t (16, __HI__);
|
|
__intN_t (32, __SI__);
|
|
__intN_t (64, __DI__);
|
|
# endif
|
|
|
|
__u_intN_t (8, __QI__);
|
|
__u_intN_t (16, __HI__);
|
|
__u_intN_t (32, __SI__);
|
|
__u_intN_t (64, __DI__);
|
|
|
|
typedef int register_t __attribute__ ((__mode__ (__word__)));
|
|
|
|
|
|
/* Some code from BIND tests this macro to see if the types above are
|
|
defined. */
|
|
#endif
|
|
#define __BIT_TYPES_DEFINED__ 1
|
|
|
|
|
|
#ifdef __USE_MISC
|
|
/* In BSD <sys/types.h> is expected to define BYTE_ORDER. */
|
|
# include <endian.h>
|
|
|
|
/* It also defines `fd_set' and the FD_* macros for `select'. */
|
|
# include <sys/select.h>
|
|
|
|
/* BSD defines these symbols, so we follow. */
|
|
# include <sys/sysmacros.h>
|
|
#endif /* Use BSD. */
|
|
|
|
|
|
#if (defined __USE_UNIX98 || defined __USE_XOPEN2K8) \
|
|
&& !defined __blksize_t_defined
|
|
typedef __blksize_t blksize_t;
|
|
# define __blksize_t_defined
|
|
#endif
|
|
|
|
/* Types from the Large File Support interface. */
|
|
#ifndef __USE_FILE_OFFSET64
|
|
# ifndef __blkcnt_t_defined
|
|
typedef __blkcnt_t blkcnt_t; /* Type to count number of disk blocks. */
|
|
# define __blkcnt_t_defined
|
|
# endif
|
|
# ifndef __fsblkcnt_t_defined
|
|
typedef __fsblkcnt_t fsblkcnt_t; /* Type to count file system blocks. */
|
|
# define __fsblkcnt_t_defined
|
|
# endif
|
|
# ifndef __fsfilcnt_t_defined
|
|
typedef __fsfilcnt_t fsfilcnt_t; /* Type to count file system inodes. */
|
|
# define __fsfilcnt_t_defined
|
|
# endif
|
|
#else
|
|
# ifndef __blkcnt_t_defined
|
|
typedef __blkcnt64_t blkcnt_t; /* Type to count number of disk blocks. */
|
|
# define __blkcnt_t_defined
|
|
# endif
|
|
# ifndef __fsblkcnt_t_defined
|
|
typedef __fsblkcnt64_t fsblkcnt_t; /* Type to count file system blocks. */
|
|
# define __fsblkcnt_t_defined
|
|
# endif
|
|
# ifndef __fsfilcnt_t_defined
|
|
typedef __fsfilcnt64_t fsfilcnt_t; /* Type to count file system inodes. */
|
|
# define __fsfilcnt_t_defined
|
|
# endif
|
|
#endif
|
|
|
|
#ifdef __USE_LARGEFILE64
|
|
typedef __blkcnt64_t blkcnt64_t; /* Type to count number of disk blocks. */
|
|
typedef __fsblkcnt64_t fsblkcnt64_t; /* Type to count file system blocks. */
|
|
typedef __fsfilcnt64_t fsfilcnt64_t; /* Type to count file system inodes. */
|
|
#endif
|
|
|
|
|
|
/* Now add the thread types. */
|
|
#if defined __USE_POSIX199506 || defined __USE_UNIX98
|
|
# include <bits/pthreadtypes.h>
|
|
#endif
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* sys/types.h */
|