mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
11160cb76f
The types u_char, u_short, u_int, u_long, ushort, uint, ulong, u_int8_t,
u_int16_t, u_int32_t, u_int64_t, quad_t, and u_quad_t are BSDisms that
have never been standardized. While glibc should continue to *provide*
these types for compatibility's sake, its public headers should not
use them.
The meat of this change was mechanically generated by the following
shell command:
perl -pi~ -e '
s/\b(__)?u_char\b/unsigned char/g;
s/\b(__)?u_?short\b/unsigned short/g;
s/\b(__)?u_?int\b/unsigned int/g;
s/\b(__)?u_?long\b/unsigned long/g;
s/\b(__)?u_int8_t\b/uint8_t/g;
s/\b(__)?u_int16_t\b/uint16_t/g;
s/\b(__)?u_int32_t\b/uint32_t/g;
s/\b(__)?u_int64_t\b/uint64_t/g;
s/\b(__)?u_quad_t\b/uint64_t/g;
s/\b(__)?quad_t\b/uint64_t/g;
' $(grep -lE -e '\<((__)?(quad_t|u(short|int|long|_(char|short|int([0-9]+_t)?|long|quad_t))))\>' \
$(grep -LE '\<(_(SYS|BITS)_TYPES_H|rpc/(rpc|rpc_msg|types|xdr)\.h)\>' \
$(find . \( -false $(sed 's/^/-o -name /' all-installed-headers) \
\) -printf '%P\n' | sort -u)))
where 'all-installed-headers' was a list of the basenames of all installed
header files, manually extracted from the Makefiles. Non-installed
wrapper headers in include/ are also adjusted, for consistency.
I then manually fixed up indentation and line-wrapping.
sys/types.h and bits/types.h are excluded because they must continue
to define the u_* types (under __USE_MISC) for compatibility with
applications. They do not use these types themselves.
All headers that (transitively) include rpc/types.h are also excluded,
for three reasons. First, the u_* types are defined by rpc/types.h,
unconditionally (not just under __USE_MISC) so they are logically part
of the SunRPC API. Second, many of those headers appear to be
machine-generated. Third, it's my understanding that we are getting
rid of as much of SunRPC as possible in the near future.
(The one file under sunrpc/ that's touched, sunrpc/rpc/rpc_des.h, does
*not* include rpc/types.h. This may itself be a bug.)
After changing from u_intNN_t to uintNN_t, a number of headers now
need to include stdint.h to pick up those types. It might be more
hygenic, namespace-wise, to use __uintNN_t instead, but none of these
headers are bound by ISO or POSIX to do so, and it's unlikely that
anyone using them will be bothered. (The two files that were using
__-prefixed versions of the u_types, sysdeps/mach/hurd/net/route.h and
sysdeps/unix/sysv/linux/net/route.h, both already also contained uses of
the unprefixed versions.)
Some of these files directly included features.h and/or sys/cdefs.h,
which I removed, as the style generally seems to be to let sys/types.h
do that for us. (This does not change the set of definitions exposed
by any header; sys/types.h unconditionally includes both features.h
and sys/cdefs.h.)
One file included asm/types.h unnecessarily.
* bits/in.h, gmon/sys/gmon.h, inet/netinet/igmp.h
* inet/protocols/routed.h, inet/protocols/talkd.h
* inet/protocols/timed.h, io/fts.h, nptl_db/thread_db.h
* resolv/arpa/nameser.h, resolv/resolv.h, sunrpc/rpc/rpc_des.h
* sysdeps/generic/netinet/if_ether.h
* sysdeps/generic/netinet/in_systm.h
* sysdeps/generic/netinet/ip.h, sysdeps/generic/netinet/tcp.h
* sysdeps/gnu/netinet/ip_icmp.h, sysdeps/gnu/netinet/tcp.h
* sysdeps/gnu/netinet/udp.h, sysdeps/mach/hurd/net/ethernet.h
* sysdeps/mach/hurd/net/if_arp.h
* sysdeps/mach/hurd/net/if_ppp.h
* sysdeps/mach/hurd/net/route.h, sysdeps/mach/sys/reboot.h
* sysdeps/unix/sysv/linux/bits/in.h
* sysdeps/unix/sysv/linux/net/ethernet.h
* sysdeps/unix/sysv/linux/net/if_arp.h
* sysdeps/unix/sysv/linux/net/if_ppp.h
* sysdeps/unix/sysv/linux/net/if_shaper.h
* sysdeps/unix/sysv/linux/net/route.h
* sysdeps/unix/sysv/linux/netinet/if_ether.h
* sysdeps/unix/sysv/linux/netinet/if_fddi.h
* sysdeps/unix/sysv/linux/netinet/if_tr.h
* sysdeps/unix/sysv/linux/netipx/ipx.h
* sysdeps/unix/sysv/linux/sys/acct.h
* include/arpa/nameser.h, include/resolv.h:
Change all uses of u_char to unsigned char,
u_short and ushort to unsigned short, u_int and uint to unsigned int,
u_long and ulong to unsigned long, u_int8_t to uint8_t,
u_int16_t to uint16_t, u_int32_t to uint32_t, quad_t to int64_t,
and u_int64_t and u_quad_t to uint64_t.
* mach/sys/reboot.h: Remove two casts of integer literals
to the types they already have.
* bits/in.h: Correct error in description of IP_MULTICAST_LOOP.
* sysdeps/unix/sysv/linux/bits/in.h: Likewise.
* sysdeps/unix/sysv/linux/netinet/if_ether.h: Change a comment
from referring to 'unsigned char' to 'uint8_t' for consistency with
the macro definition below.
* gmon/sys/gmon.h, inet/netinet/igmp.h, inet/protocols/talkd.h
* io/fts.h, resolv/arpa/nameser.h, resolv/resolv.h
* sunrpc/rpc/rpc_des.h, sysdeps/generic/netinet/ip.h
* sysdeps/gnu/netinet/tcp.h, sysdeps/gnu/netinet/udp.h
* sysdeps/mach/hurd/net/if_ppp.h, sysdeps/unix/sysv/linux/net/if_ppp.h
* sysdeps/unix/sysv/linux/sys/acct.h
* include/arpa/nameser.h, include/resolv.h:
Fix indentation disrupted by mechanical edits.
* inet/protocols/talkd.h, resolv/arpa/nameser.h
* sysdeps/generic/netinet/in_systm.h
* sysdeps/gnu/netinet/ip_icmp.h, sysdeps/gnu/netinet/tcp.h
* sysdeps/gnu/netinet/udp.h
* sysdeps/unix/sysv/linux/net/ethernet.h
* sysdeps/unix/sysv/linux/net/if_arp.h
* sysdeps/unix/sysv/linux/net/if_ppp.h
* sysdeps/unix/sysv/linux/net/if_shaper.h
* sysdeps/unix/sysv/linux/netinet/if_fddi.h
* sysdeps/unix/sysv/linux/netinet/if_tr.h
* sysdeps/unix/sysv/linux/netipx/ipx.h
* sysdeps/unix/sysv/linux/sys/acct.h
Include stdint.h for uintNN_t definitions.
Don't include sys/cdefs.h, features.h, or asm/types.h directly.
116 lines
4.1 KiB
C
116 lines
4.1 KiB
C
/* Copyright (C) 1997-2016 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/>. */
|
|
|
|
/* Generic version. */
|
|
|
|
#ifndef _NETINET_IN_H
|
|
# error "Never use <bits/in.h> directly; include <netinet/in.h> instead."
|
|
#endif
|
|
|
|
/* This is the generic version, do not assume a linux-based kernel. */
|
|
#define __USE_KERNEL_IPV6_DEFS 0
|
|
|
|
/* To select the IP level. */
|
|
#define SOL_IP 0
|
|
|
|
/* Options for use with `getsockopt' and `setsockopt' at the IP level.
|
|
The first word in the comment at the right is the data type used;
|
|
"bool" means a boolean value stored in an `int'. */
|
|
#define IP_OPTIONS 1 /* ip_opts; IP per-packet options. */
|
|
#define IP_HDRINCL 2 /* int; Header is included with data. */
|
|
#define IP_TOS 3 /* int; IP type of service and precedence. */
|
|
#define IP_TTL 4 /* int; IP time to live. */
|
|
#define IP_RECVOPTS 5 /* bool; Receive all IP options w/datagram. */
|
|
#define IP_RECVRETOPTS 6 /* bool; Receive IP options for response. */
|
|
#define IP_RECVDSTADDR 7 /* bool; Receive IP dst addr w/datagram. */
|
|
#define IP_RETOPTS 8 /* ip_opts; Set/get IP per-packet options. */
|
|
#define IP_MULTICAST_IF 9 /* in_addr; set/get IP multicast i/f */
|
|
#define IP_MULTICAST_TTL 10 /* unsigned char; set/get IP multicast ttl */
|
|
#define IP_MULTICAST_LOOP 11 /* bool; set/get IP multicast loopback */
|
|
#define IP_ADD_MEMBERSHIP 12 /* ip_mreq; add an IP group membership */
|
|
#define IP_DROP_MEMBERSHIP 13 /* ip_mreq; drop an IP group membership */
|
|
|
|
/* Structure used to describe IP options for IP_OPTIONS and IP_RETOPTS.
|
|
The `ip_dst' field is used for the first-hop gateway when using a
|
|
source route (this gets put into the header proper). */
|
|
struct ip_opts
|
|
{
|
|
struct in_addr ip_dst; /* First hop; zero without source route. */
|
|
char ip_opts[40]; /* Actually variable in size. */
|
|
};
|
|
|
|
/* Socket-level values for IPv6. */
|
|
#define SOL_IPV6 41
|
|
#define SOL_ICMPV6 58
|
|
|
|
/* IPV6 socket options. */
|
|
#define IPV6_ADDRFORM 1
|
|
#define IPV6_2292PKTINFO 2
|
|
#define IPV6_2292HOPOPTS 3
|
|
#define IPV6_2292DSTOPTS 4
|
|
#define IPV6_2292RTHDR 5
|
|
#define IPV6_2292PKTOPTIONS 6
|
|
#define IPV6_CHECKSUM 7
|
|
#define IPV6_2292HOPLIMIT 8
|
|
|
|
#define IPV6_RXINFO IPV6_2292PKTINFO
|
|
#define IPV6_TXINFO IPV6_RXINFO
|
|
#define SCM_SRCINFO IPV6_TXINFO
|
|
#define SCM_SRCRT IPV6_RXSRCRT
|
|
|
|
#define IPV6_UNICAST_HOPS 16
|
|
#define IPV6_MULTICAST_IF 17
|
|
#define IPV6_MULTICAST_HOPS 18
|
|
#define IPV6_MULTICAST_LOOP 19
|
|
#define IPV6_JOIN_GROUP 20
|
|
#define IPV6_LEAVE_GROUP 21
|
|
#define IPV6_ROUTER_ALERT 22
|
|
#define IPV6_MTU_DISCOVER 23
|
|
#define IPV6_MTU 24
|
|
#define IPV6_RECVERR 25
|
|
#define IPV6_V6ONLY 26
|
|
#define IPV6_JOIN_ANYCAST 27
|
|
#define IPV6_LEAVE_ANYCAST 28
|
|
|
|
/* Advanced API (RFC3542) (1). */
|
|
#define IPV6_RECVPKTINFO 49
|
|
#define IPV6_PKTINFO 50
|
|
#define IPV6_RECVHOPLIMIT 51
|
|
#define IPV6_HOPLIMIT 52
|
|
#define IPV6_RECVHOPOPTS 53
|
|
#define IPV6_HOPOPTS 54
|
|
#define IPV6_RTHDRDSTOPTS 55
|
|
#define IPV6_RECVRTHDR 56
|
|
#define IPV6_RTHDR 57
|
|
#define IPV6_RECVDSTOPTS 58
|
|
#define IPV6_DSTOPTS 59
|
|
#define IPV6_RECVPATHMTU 60
|
|
#define IPV6_PATHMTU 61
|
|
#define IPV6_DONTFRAG 62
|
|
|
|
/* Obsolete synonyms for the above. */
|
|
#define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP
|
|
#define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP
|
|
#define IPV6_RXHOPOPTS IPV6_2292HOPOPTS
|
|
#define IPV6_RXDSTOPTS IPV6_2292DSTOPTS
|
|
|
|
/* Routing header options for IPv6. */
|
|
#define IPV6_RTHDR_LOOSE 0 /* Hop doesn't need to be neighbour. */
|
|
#define IPV6_RTHDR_STRICT 1 /* Hop must be a neighbour. */
|
|
|
|
#define IPV6_RTHDR_TYPE_0 0 /* IPv6 Routing header type 0. */
|