mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-30 08:40:07 +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].
111 lines
3.6 KiB
C
111 lines
3.6 KiB
C
/* Copyright (C) 1997-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 _NETINET_IF_TR_H
|
|
#define _NETINET_IF_TR_H 1
|
|
|
|
#include <sys/cdefs.h>
|
|
#include <sys/types.h>
|
|
|
|
/* IEEE 802.5 Token-Ring magic constants. The frame sizes omit the preamble
|
|
and FCS/CRC (frame check sequence). */
|
|
#define TR_ALEN 6 /* Octets in one token-ring addr */
|
|
#define TR_HLEN (sizeof (struct trh_hdr) + sizeof (struct trllc))
|
|
#define AC 0x10
|
|
#define LLC_FRAME 0x40
|
|
|
|
/* LLC and SNAP constants */
|
|
#define EXTENDED_SAP 0xAA
|
|
#define UI_CMD 0x03
|
|
|
|
/* This is an Token-Ring frame header. */
|
|
struct trh_hdr
|
|
{
|
|
u_int8_t ac; /* access control field */
|
|
u_int8_t fc; /* frame control field */
|
|
u_int8_t daddr[TR_ALEN]; /* destination address */
|
|
u_int8_t saddr[TR_ALEN]; /* source address */
|
|
u_int16_t rcf; /* route control field */
|
|
u_int16_t rseg[8]; /* routing registers */
|
|
};
|
|
|
|
/* This is an Token-Ring LLC structure */
|
|
struct trllc
|
|
{
|
|
u_int8_t dsap; /* destination SAP */
|
|
u_int8_t ssap; /* source SAP */
|
|
u_int8_t llc; /* LLC control field */
|
|
u_int8_t protid[3]; /* protocol id */
|
|
u_int16_t ethertype; /* ether type field */
|
|
};
|
|
|
|
/* Token-Ring statistics collection data. */
|
|
struct tr_statistics
|
|
{
|
|
unsigned long rx_packets; /* total packets received */
|
|
unsigned long tx_packets; /* total packets transmitted */
|
|
unsigned long rx_bytes; /* total bytes received */
|
|
unsigned long tx_bytes; /* total bytes transmitted */
|
|
unsigned long rx_errors; /* bad packets received */
|
|
unsigned long tx_errors; /* packet transmit problems */
|
|
unsigned long rx_dropped; /* no space in linux buffers */
|
|
unsigned long tx_dropped; /* no space available in linux */
|
|
unsigned long multicast; /* multicast packets received */
|
|
unsigned long transmit_collision;
|
|
|
|
/* detailed Token-Ring errors. See IBM Token-Ring Network
|
|
Architecture for more info */
|
|
|
|
unsigned long line_errors;
|
|
unsigned long internal_errors;
|
|
unsigned long burst_errors;
|
|
unsigned long A_C_errors;
|
|
unsigned long abort_delimiters;
|
|
unsigned long lost_frames;
|
|
unsigned long recv_congest_count;
|
|
unsigned long frame_copied_errors;
|
|
unsigned long frequency_errors;
|
|
unsigned long token_errors;
|
|
unsigned long dummy1;
|
|
};
|
|
|
|
/* source routing stuff */
|
|
#define TR_RII 0x80
|
|
#define TR_RCF_DIR_BIT 0x80
|
|
#define TR_RCF_LEN_MASK 0x1f00
|
|
#define TR_RCF_BROADCAST 0x8000 /* all-routes broadcast */
|
|
#define TR_RCF_LIMITED_BROADCAST 0xC000 /* single-route broadcast */
|
|
#define TR_RCF_FRAME2K 0x20
|
|
#define TR_RCF_BROADCAST_MASK 0xC000
|
|
#define TR_MAXRIFLEN 18
|
|
|
|
#ifdef __USE_MISC
|
|
|
|
struct trn_hdr
|
|
{
|
|
u_int8_t trn_ac; /* access control field */
|
|
u_int8_t trn_fc; /* field control field */
|
|
u_int8_t trn_dhost[TR_ALEN]; /* destination host */
|
|
u_int8_t trn_shost[TR_ALEN]; /* source host */
|
|
u_int16_t trn_rcf; /* route control field */
|
|
u_int16_t trn_rseg[8]; /* routing registers */
|
|
};
|
|
|
|
#endif
|
|
|
|
#endif /* netinet/if_tr.h */
|