diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 16:47:27 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 16:47:27 +0000 |
| commit | 075f984a3aa393417f049bddd5afcee83396dde0 (patch) | |
| tree | 62170b965c34ed46b18567ceb847141d3aac15ef /sysdeps/unix/sysv/linux/netipx/ipx.h | |
| parent | 64c3bdb6f9bb3e5ebd004acf08d89371f4c0d26e (diff) | |
| parent | 963c37d5c0eb62b38f8764b23931c0dcdd497a13 (diff) | |
Merge commit 'refs/top-bases/t/ifaddrs_v6' into t/ifaddrs_v6t/ifaddrs_v6
Diffstat (limited to 'sysdeps/unix/sysv/linux/netipx/ipx.h')
| -rw-r--r-- | sysdeps/unix/sysv/linux/netipx/ipx.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sysdeps/unix/sysv/linux/netipx/ipx.h b/sysdeps/unix/sysv/linux/netipx/ipx.h index 855ab9903d..bacea41718 100644 --- a/sysdeps/unix/sysv/linux/netipx/ipx.h +++ b/sysdeps/unix/sysv/linux/netipx/ipx.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2016 Free Software Foundation, Inc. +/* Copyright (C) 1991-2018 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 @@ -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 */ }; |