about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChris Denton <chris@chrisdenton.dev>2024-07-14 06:59:05 +0000
committerChris Denton <chris@chrisdenton.dev>2024-07-15 05:01:20 +0000
commit5b700a76cf1c1d815f0082f7ea12c5f8c5a45114 (patch)
tree0781db158727b99f2aa3a767c41dcb22424236d3
parentf2cc94361c70ca792a783ad858e2a2b68aedb4a5 (diff)
downloadrust-5b700a76cf1c1d815f0082f7ea12c5f8c5a45114.tar.gz
rust-5b700a76cf1c1d815f0082f7ea12c5f8c5a45114.zip
Remove CHAR
As with USHORT, keep using C types for BSD socket APIs.
-rw-r--r--library/std/src/sys/pal/windows/c.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/library/std/src/sys/pal/windows/c.rs b/library/std/src/sys/pal/windows/c.rs
index 20f1ff84b7b..f38cf0e2ac7 100644
--- a/library/std/src/sys/pal/windows/c.rs
+++ b/library/std/src/sys/pal/windows/c.rs
@@ -20,7 +20,6 @@ pub use windows_sys::*;
 pub type DWORD = c_ulong;
 pub type WCHAR = u16;
 pub type SIZE_T = usize;
-pub type CHAR = c_char;
 pub type ULONG = c_ulong;
 
 pub type LPCVOID = *const c_void;
@@ -142,9 +141,9 @@ pub struct MOUNT_POINT_REPARSE_BUFFER {
 #[repr(C)]
 pub struct SOCKADDR_STORAGE_LH {
     pub ss_family: ADDRESS_FAMILY,
-    pub __ss_pad1: [CHAR; 6],
+    pub __ss_pad1: [c_char; 6],
     pub __ss_align: i64,
-    pub __ss_pad2: [CHAR; 112],
+    pub __ss_pad2: [c_char; 112],
 }
 
 #[repr(C)]
@@ -153,7 +152,7 @@ pub struct sockaddr_in {
     pub sin_family: ADDRESS_FAMILY,
     pub sin_port: c_ushort,
     pub sin_addr: in_addr,
-    pub sin_zero: [CHAR; 8],
+    pub sin_zero: [c_char; 8],
 }
 
 #[repr(C)]