Remove Windows GNU restriction and add to CI

petesmc · folkertdev · commit 55d99daa23b6 · 2025-07-13T11:56:18.000+02:00
diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
@@ -48,6 +48,10 @@ jobs:
             os: windows-2022
             features: ""
             target: "x86_64-pc-windows-gnu"
+          - rust: stable-x86_64-msvc
+            os: windows-2022
+            features: ""
+            target: "x86_64-pc-windows-msvc"
     steps:
       - name: Checkout sources
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
diff --git a/bzip2.rs b/bzip2.rs
@@ -31,7 +31,7 @@ extern "C" {
     static mut stdout_handle: *mut FILE;
 }
 
-#[cfg(all(target_os = "windows", target_env = "gnu"))]
+#[cfg(target_os = "windows")]
 extern "C" {
     fn __acrt_iob_func(idx: libc::c_uint) -> *mut FILE;
 }
@@ -43,7 +43,7 @@ macro_rules! STDIN {
     };
 }
 
-#[cfg(all(target_os = "windows", target_env = "gnu"))]
+#[cfg(target_os = "windows")]
 macro_rules! STDIN {
     () => {
         __acrt_iob_func(0)
@@ -57,7 +57,7 @@ macro_rules! STDOUT {
     };
 }
 
-#[cfg(all(target_os = "windows", target_env = "gnu"))]
+#[cfg(target_os = "windows")]
 macro_rules! STDOUT {
     () => {
         __acrt_iob_func(1)
diff --git a/libbz2-rs-sys/src/high_level.rs b/libbz2-rs-sys/src/high_level.rs
@@ -33,7 +33,7 @@ extern "C" {
     static mut stdout: *mut FILE;
 }
 
-#[cfg(all(target_os = "windows", target_env = "gnu"))]
+#[cfg(target_os = "windows")]
 extern "C" {
     fn __acrt_iob_func(idx: libc::c_uint) -> *mut FILE;
 }
@@ -45,7 +45,7 @@ macro_rules! STDIN {
     };
 }
 
-#[cfg(all(target_os = "windows", target_env = "gnu"))]
+#[cfg(target_os = "windows")]
 macro_rules! STDIN {
     () => {
         __acrt_iob_func(0)
@@ -59,7 +59,7 @@ macro_rules! STDOUT {
     };
 }
 
-#[cfg(all(target_os = "windows", target_env = "gnu"))]
+#[cfg(target_os = "windows")]
 macro_rules! STDOUT {
     () => {
         __acrt_iob_func(1)

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ extern "C" {`
`31`	`31`	`static mut stdout_handle: *mut FILE;`
`32`	`32`	`}`
`33`	`33`
`34`		`-#[cfg(all(target_os = "windows", target_env = "gnu"))]`
	`34`	`+#[cfg(target_os = "windows")]`
`35`	`35`	`extern "C" {`
`36`	`36`	`fn __acrt_iob_func(idx: libc::c_uint) -> *mut FILE;`
`37`	`37`	`}`
`@@ -43,7 +43,7 @@ macro_rules! STDIN {`
`43`	`43`	`};`
`44`	`44`	`}`
`45`	`45`
`46`		`-#[cfg(all(target_os = "windows", target_env = "gnu"))]`
	`46`	`+#[cfg(target_os = "windows")]`
`47`	`47`	`macro_rules! STDIN {`
`48`	`48`	`() => {`
`49`	`49`	`__acrt_iob_func(0)`
`@@ -57,7 +57,7 @@ macro_rules! STDOUT {`
`57`	`57`	`};`
`58`	`58`	`}`
`59`	`59`
`60`		`-#[cfg(all(target_os = "windows", target_env = "gnu"))]`
	`60`	`+#[cfg(target_os = "windows")]`
`61`	`61`	`macro_rules! STDOUT {`
`62`	`62`	`() => {`
`63`	`63`	`__acrt_iob_func(1)`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ extern "C" {`
`33`	`33`	`static mut stdout: *mut FILE;`
`34`	`34`	`}`
`35`	`35`
`36`		`-#[cfg(all(target_os = "windows", target_env = "gnu"))]`
	`36`	`+#[cfg(target_os = "windows")]`
`37`	`37`	`extern "C" {`
`38`	`38`	`fn __acrt_iob_func(idx: libc::c_uint) -> *mut FILE;`
`39`	`39`	`}`
`@@ -45,7 +45,7 @@ macro_rules! STDIN {`
`45`	`45`	`};`
`46`	`46`	`}`
`47`	`47`
`48`		`-#[cfg(all(target_os = "windows", target_env = "gnu"))]`
	`48`	`+#[cfg(target_os = "windows")]`
`49`	`49`	`macro_rules! STDIN {`
`50`	`50`	`() => {`
`51`	`51`	`__acrt_iob_func(0)`
`@@ -59,7 +59,7 @@ macro_rules! STDOUT {`
`59`	`59`	`};`
`60`	`60`	`}`
`61`	`61`
`62`		`-#[cfg(all(target_os = "windows", target_env = "gnu"))]`
	`62`	`+#[cfg(target_os = "windows")]`
`63`	`63`	`macro_rules! STDOUT {`
`64`	`64`	`() => {`
`65`	`65`	`__acrt_iob_func(1)`