Remove USHORT · model-checking/verify-rust-std@00a5b3b (original) (raw)

Original file line number Diff line number Diff line change
@@ -19,7 +19,6 @@ pub use windows_sys::*;
19 19
20 20 pub type DWORD = c_ulong;
21 21 pub type WCHAR = u16;
22 -pub type USHORT = c_ushort;
23 22 pub type SIZE_T = usize;
24 23 pub type CHAR = c_char;
25 24 pub type ULONG = c_ulong;
@@ -33,7 +32,7 @@ pub type LPVOID = *mut c_void;
33 32 pub type PSRWLOCK = *mut SRWLOCK;
34 33
35 34 pub type socklen_t = c_int;
36 -pub type ADDRESS_FAMILY = USHORT;
35 +pub type ADDRESS_FAMILY = c_ushort;
37 36 pub use FD_SET as fd_set;
38 37 pub use LINGER as linger;
39 38 pub use TIMEVAL as timeval;
@@ -152,7 +151,7 @@ pub struct SOCKADDR_STORAGE_LH {
152 151 #[derive(Copy, Clone)]
153 152 pub struct sockaddr_in {
154 153 pub sin_family: ADDRESS_FAMILY,
155 -pub sin_port: USHORT,
154 +pub sin_port: c_ushort,
156 155 pub sin_addr: in_addr,
157 156 pub sin_zero: [CHAR; 8],
158 157 }
@@ -161,7 +160,7 @@ pub struct sockaddr_in {
161 160 #[derive(Copy, Clone)]
162 161 pub struct sockaddr_in6 {
163 162 pub sin6_family: ADDRESS_FAMILY,
164 -pub sin6_port: USHORT,
163 +pub sin6_port: c_ushort,
165 164 pub sin6_flowinfo: c_ulong,
166 165 pub sin6_addr: in6_addr,
167 166 pub sin6_scope_id: c_ulong,