diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux')
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/in.h | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/net/ethernet.h | 11 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/net/if_arp.h | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/net/if_ppp.h | 9 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/net/if_shaper.h | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/net/route.h | 12 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/netinet/if_ether.h | 16 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/netinet/if_fddi.h | 10 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/netinet/if_tr.h | 36 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/netipx/ipx.h | 9 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sys/acct.h | 31 |
11 files changed, 72 insertions, 77 deletions
diff --git a/sysdeps/unix/sysv/linux/bits/in.h b/sysdeps/unix/sysv/linux/bits/in.h index 4d70a6baba..f2824bb55b 100644 --- a/sysdeps/unix/sysv/linux/bits/in.h +++ b/sysdeps/unix/sysv/linux/bits/in.h @@ -53,8 +53,8 @@ #define IP_RECVRETOPTS IP_RETOPTS /* bool; Receive IP options for response. */ #define IP_RETOPTS 7 /* ip_opts; Set/get IP per-packet options. */ #define IP_MULTICAST_IF 32 /* in_addr; set/get IP multicast i/f */ -#define IP_MULTICAST_TTL 33 /* u_char; set/get IP multicast ttl */ -#define IP_MULTICAST_LOOP 34 /* i_char; set/get IP multicast loopback */ +#define IP_MULTICAST_TTL 33 /* unsigned char; set/get IP multicast ttl */ +#define IP_MULTICAST_LOOP 34 /* bool; set/get IP multicast loopback */ #define IP_ADD_MEMBERSHIP 35 /* ip_mreq; add an IP group membership */ #define IP_DROP_MEMBERSHIP 36 /* ip_mreq; drop an IP group membership */ #define IP_UNBLOCK_SOURCE 37 /* ip_mreq_source: unblock data from source */ diff --git a/sysdeps/unix/sysv/linux/net/ethernet.h b/sysdeps/unix/sysv/linux/net/ethernet.h index 3160e9341b..833473e41d 100644 --- a/sysdeps/unix/sysv/linux/net/ethernet.h +++ b/sysdeps/unix/sysv/linux/net/ethernet.h @@ -21,8 +21,9 @@ #ifndef __NET_ETHERNET_H #define __NET_ETHERNET_H 1 -#include <sys/cdefs.h> #include <sys/types.h> +#include <stdint.h> + #include <linux/if_ether.h> /* IEEE 802.3 Ethernet constants */ __BEGIN_DECLS @@ -31,15 +32,15 @@ __BEGIN_DECLS systems. */ struct ether_addr { - u_int8_t ether_addr_octet[ETH_ALEN]; + uint8_t ether_addr_octet[ETH_ALEN]; } __attribute__ ((__packed__)); /* 10Mb/s ethernet header */ struct ether_header { - u_int8_t ether_dhost[ETH_ALEN]; /* destination eth addr */ - u_int8_t ether_shost[ETH_ALEN]; /* source ether addr */ - u_int16_t ether_type; /* packet type ID field */ + uint8_t ether_dhost[ETH_ALEN]; /* destination eth addr */ + uint8_t ether_shost[ETH_ALEN]; /* source ether addr */ + uint16_t ether_type; /* packet type ID field */ } __attribute__ ((__packed__)); /* Ethernet protocol ID's */ diff --git a/sysdeps/unix/sysv/linux/net/if_arp.h b/sysdeps/unix/sysv/linux/net/if_arp.h index 1b3f1d3820..9a20c8358f 100644 --- a/sysdeps/unix/sysv/linux/net/if_arp.h +++ b/sysdeps/unix/sysv/linux/net/if_arp.h @@ -20,12 +20,11 @@ /* Based on the 4.4BSD and Linux version of this file. */ #ifndef _NET_IF_ARP_H - #define _NET_IF_ARP_H 1 -#include <sys/cdefs.h> #include <sys/types.h> #include <sys/socket.h> +#include <stdint.h> __BEGIN_DECLS @@ -171,7 +170,7 @@ struct arpreq_old struct arpd_request { unsigned short int req; /* Request type. */ - u_int32_t ip; /* IP address of entry. */ + uint32_t ip; /* IP address of entry. */ unsigned long int dev; /* Device entry is tied to. */ unsigned long int stamp; unsigned long int updated; diff --git a/sysdeps/unix/sysv/linux/net/if_ppp.h b/sysdeps/unix/sysv/linux/net/if_ppp.h index 1b1c3ea6eb..9994982fc0 100644 --- a/sysdeps/unix/sysv/linux/net/if_ppp.h +++ b/sysdeps/unix/sysv/linux/net/if_ppp.h @@ -49,8 +49,7 @@ #define __NET_IF_PPP_H 1 #include <sys/types.h> -#include <sys/cdefs.h> - +#include <stdint.h> #include <net/if.h> #include <sys/ioctl.h> #include <net/ppp_defs.h> @@ -114,9 +113,9 @@ struct npioctl { /* Structure describing a CCP configuration option, for PPPIOCSCOMPRESS */ struct ppp_option_data { - u_int8_t *ptr; - u_int32_t length; - int transmit; + uint8_t *ptr; + uint32_t length; + int transmit; }; struct ifpppstatsreq { diff --git a/sysdeps/unix/sysv/linux/net/if_shaper.h b/sysdeps/unix/sysv/linux/net/if_shaper.h index 956ad62c9b..e318794e0f 100644 --- a/sysdeps/unix/sysv/linux/net/if_shaper.h +++ b/sysdeps/unix/sysv/linux/net/if_shaper.h @@ -18,8 +18,8 @@ #ifndef _NET_IF_SHAPER_H #define _NET_IF_SHAPER_H 1 -#include <features.h> #include <sys/types.h> +#include <stdint.h> #include <net/if.h> #include <sys/ioctl.h> @@ -43,11 +43,11 @@ __BEGIN_DECLS struct shaperconf { - u_int16_t ss_cmd; + uint16_t ss_cmd; union { char ssu_name[14]; - u_int32_t ssu_speed; + uint32_t ssu_speed; } ss_u; #define ss_speed ss_u.ssu_speed #define ss_name ss_u.ssu_name diff --git a/sysdeps/unix/sysv/linux/net/route.h b/sysdeps/unix/sysv/linux/net/route.h index 11d21c6cf1..ea785ab04a 100644 --- a/sysdeps/unix/sysv/linux/net/route.h +++ b/sysdeps/unix/sysv/linux/net/route.h @@ -59,12 +59,12 @@ struct in6_rtmsg struct in6_addr rtmsg_dst; struct in6_addr rtmsg_src; struct in6_addr rtmsg_gateway; - u_int32_t rtmsg_type; - u_int16_t rtmsg_dst_len; - u_int16_t rtmsg_src_len; - u_int32_t rtmsg_metric; + uint32_t rtmsg_type; + uint16_t rtmsg_dst_len; + uint16_t rtmsg_src_len; + uint32_t rtmsg_metric; unsigned long int rtmsg_info; - u_int32_t rtmsg_flags; + uint32_t rtmsg_flags; int rtmsg_ifindex; }; @@ -113,7 +113,7 @@ struct in6_rtmsg #define RTF_NAT 0x08000000 #define RTF_ADDRCLASSMASK 0xF8000000 -#define RT_ADDRCLASS(flags) ((__u_int32_t) flags >> 23) +#define RT_ADDRCLASS(flags) ((uint32_t) flags >> 23) #define RT_TOS(tos) ((tos) & IPTOS_TOS_MASK) diff --git a/sysdeps/unix/sysv/linux/netinet/if_ether.h b/sysdeps/unix/sysv/linux/netinet/if_ether.h index e9ed13774f..ccd8cebbaf 100644 --- a/sysdeps/unix/sysv/linux/netinet/if_ether.h +++ b/sysdeps/unix/sysv/linux/netinet/if_ether.h @@ -70,10 +70,10 @@ __BEGIN_DECLS */ struct ether_arp { struct arphdr ea_hdr; /* fixed-size header */ - u_int8_t arp_sha[ETH_ALEN]; /* sender hardware address */ - u_int8_t arp_spa[4]; /* sender protocol address */ - u_int8_t arp_tha[ETH_ALEN]; /* target hardware address */ - u_int8_t arp_tpa[4]; /* target protocol address */ + uint8_t arp_sha[ETH_ALEN]; /* sender hardware address */ + uint8_t arp_spa[4]; /* sender protocol address */ + uint8_t arp_tha[ETH_ALEN]; /* target hardware address */ + uint8_t arp_tpa[4]; /* target protocol address */ }; #define arp_hrd ea_hdr.ar_hrd #define arp_pro ea_hdr.ar_pro @@ -88,14 +88,14 @@ struct ether_arp { */ #define ETHER_MAP_IP_MULTICAST(ipaddr, enaddr) \ /* struct in_addr *ipaddr; */ \ - /* u_char enaddr[ETH_ALEN]; */ \ + /* uint8_t enaddr[ETH_ALEN]; */ \ { \ (enaddr)[0] = 0x01; \ (enaddr)[1] = 0x00; \ (enaddr)[2] = 0x5e; \ - (enaddr)[3] = ((u_int8_t *)ipaddr)[1] & 0x7f; \ - (enaddr)[4] = ((u_int8_t *)ipaddr)[2]; \ - (enaddr)[5] = ((u_int8_t *)ipaddr)[3]; \ + (enaddr)[3] = ((uint8_t *)ipaddr)[1] & 0x7f; \ + (enaddr)[4] = ((uint8_t *)ipaddr)[2]; \ + (enaddr)[5] = ((uint8_t *)ipaddr)[3]; \ } __END_DECLS diff --git a/sysdeps/unix/sysv/linux/netinet/if_fddi.h b/sysdeps/unix/sysv/linux/netinet/if_fddi.h index 6e0ab370de..675801418f 100644 --- a/sysdeps/unix/sysv/linux/netinet/if_fddi.h +++ b/sysdeps/unix/sysv/linux/netinet/if_fddi.h @@ -18,18 +18,16 @@ #ifndef _NETINET_IF_FDDI_H #define _NETINET_IF_FDDI_H 1 -#include <sys/cdefs.h> #include <sys/types.h> -#include <asm/types.h> - +#include <stdint.h> #include <linux/if_fddi.h> #ifdef __USE_MISC struct fddi_header { - u_int8_t fddi_fc; /* Frame Control (FC) value */ - u_int8_t fddi_dhost[FDDI_K_ALEN]; /* Destination host */ - u_int8_t fddi_shost[FDDI_K_ALEN]; /* Source host */ + uint8_t fddi_fc; /* Frame Control (FC) value */ + uint8_t fddi_dhost[FDDI_K_ALEN]; /* Destination host */ + uint8_t fddi_shost[FDDI_K_ALEN]; /* Source host */ }; #endif diff --git a/sysdeps/unix/sysv/linux/netinet/if_tr.h b/sysdeps/unix/sysv/linux/netinet/if_tr.h index c203d11be1..814a35d5da 100644 --- a/sysdeps/unix/sysv/linux/netinet/if_tr.h +++ b/sysdeps/unix/sysv/linux/netinet/if_tr.h @@ -18,8 +18,8 @@ #ifndef _NETINET_IF_TR_H #define _NETINET_IF_TR_H 1 -#include <sys/cdefs.h> #include <sys/types.h> +#include <stdint.h> /* IEEE 802.5 Token-Ring magic constants. The frame sizes omit the preamble and FCS/CRC (frame check sequence). */ @@ -35,22 +35,22 @@ /* 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 */ + uint8_t ac; /* access control field */ + uint8_t fc; /* frame control field */ + uint8_t daddr[TR_ALEN]; /* destination address */ + uint8_t saddr[TR_ALEN]; /* source address */ + uint16_t rcf; /* route control field */ + uint16_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 */ + uint8_t dsap; /* destination SAP */ + uint8_t ssap; /* source SAP */ + uint8_t llc; /* LLC control field */ + uint8_t protid[3]; /* protocol id */ + uint16_t ethertype; /* ether type field */ }; /* Token-Ring statistics collection data. */ @@ -97,12 +97,12 @@ struct tr_statistics 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 */ + uint8_t trn_ac; /* access control field */ + uint8_t trn_fc; /* field control field */ + uint8_t trn_dhost[TR_ALEN]; /* destination host */ + uint8_t trn_shost[TR_ALEN]; /* source host */ + uint16_t trn_rcf; /* route control field */ + uint16_t trn_rseg[8]; /* routing registers */ }; #endif diff --git a/sysdeps/unix/sysv/linux/netipx/ipx.h b/sysdeps/unix/sysv/linux/netipx/ipx.h index 855ab9903d..338aab5095 100644 --- a/sysdeps/unix/sysv/linux/netipx/ipx.h +++ b/sysdeps/unix/sysv/linux/netipx/ipx.h @@ -18,9 +18,8 @@ #ifndef __NETIPX_IPX_H #define __NETIPX_IPX_H 1 -#include <features.h> - #include <sys/types.h> +#include <stdint.h> #include <bits/sockaddr.h> __BEGIN_DECLS @@ -34,10 +33,10 @@ __BEGIN_DECLS struct sockaddr_ipx { sa_family_t sipx_family; - u_int16_t sipx_port; - u_int32_t sipx_network; + uint16_t sipx_port; + uint32_t sipx_network; unsigned char sipx_node[IPX_NODE_LEN]; - u_int8_t sipx_type; + uint8_t sipx_type; unsigned char sipx_zero; /* 16 byte fill */ }; diff --git a/sysdeps/unix/sysv/linux/sys/acct.h b/sysdeps/unix/sysv/linux/sys/acct.h index ea0e7fde23..d24c2a7267 100644 --- a/sysdeps/unix/sysv/linux/sys/acct.h +++ b/sysdeps/unix/sysv/linux/sys/acct.h @@ -18,12 +18,11 @@ #ifndef _SYS_ACCT_H #define _SYS_ACCT_H 1 -#include <features.h> - +#include <sys/types.h> +#include <stdint.h> #include <endian.h> #define __need_time_t #include <time.h> -#include <sys/types.h> __BEGIN_DECLS @@ -35,15 +34,15 @@ __BEGIN_DECLS specific encoding system used. */ -typedef u_int16_t comp_t; +typedef uint16_t comp_t; struct acct { char ac_flag; /* Flags. */ - u_int16_t ac_uid; /* Real user ID. */ - u_int16_t ac_gid; /* Real group ID. */ - u_int16_t ac_tty; /* Controlling terminal. */ - u_int32_t ac_btime; /* Beginning time. */ + uint16_t ac_uid; /* Real user ID. */ + uint16_t ac_gid; /* Real group ID. */ + uint16_t ac_tty; /* Controlling terminal. */ + uint32_t ac_btime; /* Beginning time. */ comp_t ac_utime; /* User time. */ comp_t ac_stime; /* System time. */ comp_t ac_etime; /* Elapsed time. */ @@ -53,7 +52,7 @@ struct acct comp_t ac_minflt; /* Minor pagefaults. */ comp_t ac_majflt; /* Major pagefaults. */ comp_t ac_swaps; /* Number of swaps. */ - u_int32_t ac_exitcode; /* Process exitcode. */ + uint32_t ac_exitcode; /* Process exitcode. */ char ac_comm[ACCT_COMM+1]; /* Command name. */ char ac_pad[10]; /* Padding bytes. */ }; @@ -63,13 +62,13 @@ struct acct_v3 { char ac_flag; /* Flags */ char ac_version; /* Always set to ACCT_VERSION */ - u_int16_t ac_tty; /* Control Terminal */ - u_int32_t ac_exitcode; /* Exitcode */ - u_int32_t ac_uid; /* Real User ID */ - u_int32_t ac_gid; /* Real Group ID */ - u_int32_t ac_pid; /* Process ID */ - u_int32_t ac_ppid; /* Parent Process ID */ - u_int32_t ac_btime; /* Process Creation Time */ + uint16_t ac_tty; /* Control Terminal */ + uint32_t ac_exitcode; /* Exitcode */ + uint32_t ac_uid; /* Real User ID */ + uint32_t ac_gid; /* Real Group ID */ + uint32_t ac_pid; /* Process ID */ + uint32_t ac_ppid; /* Parent Process ID */ + uint32_t ac_btime; /* Process Creation Time */ float ac_etime; /* Elapsed Time */ comp_t ac_utime; /* User Time */ comp_t ac_stime; /* System Time */ |