mirror of
https://sourceware.org/git/glibc.git
synced 2025-01-06 01:21:08 +00: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.
112 lines
2.8 KiB
C
112 lines
2.8 KiB
C
/* Copyright (C) 1991-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/>. */
|
|
|
|
#ifndef __NETIPX_IPX_H
|
|
#define __NETIPX_IPX_H 1
|
|
|
|
#include <sys/types.h>
|
|
#include <stdint.h>
|
|
#include <bits/sockaddr.h>
|
|
|
|
__BEGIN_DECLS
|
|
|
|
#define SOL_IPX 256 /* sockopt level */
|
|
|
|
#define IPX_TYPE 1
|
|
#define IPX_NODE_LEN 6
|
|
#define IPX_MTU 576
|
|
|
|
struct sockaddr_ipx
|
|
{
|
|
sa_family_t sipx_family;
|
|
uint16_t sipx_port;
|
|
uint32_t sipx_network;
|
|
unsigned char sipx_node[IPX_NODE_LEN];
|
|
uint8_t sipx_type;
|
|
unsigned char sipx_zero; /* 16 byte fill */
|
|
};
|
|
|
|
/*
|
|
* So we can fit the extra info for SIOCSIFADDR into the address nicely
|
|
*/
|
|
|
|
#define sipx_special sipx_port
|
|
#define sipx_action sipx_zero
|
|
#define IPX_DLTITF 0
|
|
#define IPX_CRTITF 1
|
|
|
|
typedef struct ipx_route_definition
|
|
{
|
|
unsigned long ipx_network;
|
|
unsigned long ipx_router_network;
|
|
unsigned char ipx_router_node[IPX_NODE_LEN];
|
|
}
|
|
ipx_route_definition;
|
|
|
|
typedef struct ipx_interface_definition
|
|
{
|
|
unsigned long ipx_network;
|
|
unsigned char ipx_device[16];
|
|
unsigned char ipx_dlink_type;
|
|
#define IPX_FRAME_NONE 0
|
|
#define IPX_FRAME_SNAP 1
|
|
#define IPX_FRAME_8022 2
|
|
#define IPX_FRAME_ETHERII 3
|
|
#define IPX_FRAME_8023 4
|
|
#define IPX_FRAME_TR_8022 5
|
|
unsigned char ipx_special;
|
|
#define IPX_SPECIAL_NONE 0
|
|
#define IPX_PRIMARY 1
|
|
#define IPX_INTERNAL 2
|
|
unsigned char ipx_node[IPX_NODE_LEN];
|
|
}
|
|
ipx_interface_definition;
|
|
|
|
typedef struct ipx_config_data
|
|
{
|
|
unsigned char ipxcfg_auto_select_primary;
|
|
unsigned char ipxcfg_auto_create_interfaces;
|
|
}
|
|
ipx_config_data;
|
|
|
|
/*
|
|
* OLD Route Definition for backward compatibility.
|
|
*/
|
|
|
|
struct ipx_route_def
|
|
{
|
|
unsigned long ipx_network;
|
|
unsigned long ipx_router_network;
|
|
#define IPX_ROUTE_NO_ROUTER 0
|
|
unsigned char ipx_router_node[IPX_NODE_LEN];
|
|
unsigned char ipx_device[16];
|
|
unsigned short ipx_flags;
|
|
#define IPX_RT_SNAP 8
|
|
#define IPX_RT_8022 4
|
|
#define IPX_RT_BLUEBOOK 2
|
|
#define IPX_RT_ROUTED 1
|
|
};
|
|
|
|
#define SIOCAIPXITFCRT (SIOCPROTOPRIVATE)
|
|
#define SIOCAIPXPRISLT (SIOCPROTOPRIVATE + 1)
|
|
#define SIOCIPXCFGDATA (SIOCPROTOPRIVATE + 2)
|
|
#define SIOCIPXNCPCONN (SIOCPROTOPRIVATE + 3)
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* netipx/ipx.h */
|