user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move arm32 shim to c.rs

Browse source
This commit is contained in:
Chris Denton 2023-06-24 17:30:27 +01:00
parent ed1ce580ec
commit 8a7399cd45
No known key found for this signature in database
GPG key ID: 713472F2F45627DE
5 changed files with 44 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/tools/generate-windows-sys/src/arm_shim.rs
View file

@ -1,20 +0,0 @@
// Begin of ARM32 shim
// The raw content of this file should be processed by `generate-windows-sys`
// to be merged with the generated binding. It is not supposed to be used as
// a normal Rust module.
cfg_if::cfg_if! {
if #[cfg(target_arch = "arm")] {
#[repr(C)]
pub struct WSADATA {
pub wVersion: u16,
pub wHighVersion: u16,
pub szDescription: [u8; 257],
pub szSystemStatus: [u8; 129],
pub iMaxSockets: u16,
pub iMaxUdpDg: u16,
pub lpVendorInfo: PSTR,
}
pub enum CONTEXT {}
}
}
// End of ARM32 shim

4
src/tools/generate-windows-sys/src/main.rs
View file

@ -11,9 +11,6 @@ const PRELUDE: &str = r#"// This file is autogenerated.
// ignore-tidy-filelength
"#;
/// This is a shim for the ARM (32-bit) architecture, which is no longer supported by windows-rs.
const ARM_SHIM: &str = include_str!("arm_shim.rs");
fn main() -> io::Result<()> {
let mut path: PathBuf =
std::env::args_os().nth(1).expect("a path to the rust repository is required").into();
@ -35,7 +32,6 @@ fn main() -> io::Result<()> {
let mut f = std::fs::File::create(&path)?;
f.write_all(PRELUDE.as_bytes())?;
f.write_all(bindings.as_bytes())?;
f.write_all(ARM_SHIM.as_bytes())?;
Ok(())
}