Add support for alternative QNX Neutrino network stack io-sock

Signed-off-by: Florian Bartels <[email protected]>

Author: flba-eb

libc-test/build.rs

@@ -3243,7 +3243,7 @@ fn test_neutrino(target: &str) {
 
     let mut cfg = ctest_cfg();
     if target.ends_with("_iosock") {
-        let qnx_target_val = env::var("QNX_TARGET")
+        let qnx_target_val = std::env::var("QNX_TARGET")
             .unwrap_or_else(|_| "QNX_TARGET_not_set_please_source_qnxsdp".into());
 
         cfg.include(qnx_target_val + "/usr/include/io-sock");
@@ -5525,9 +5525,9 @@ fn test_aix(target: &str) {
     });
 
     cfg.type_name(move |ty, is_struct, is_union| match ty {
-        "DIR"  => ty.to_string(),
-        "FILE"  => ty.to_string(),
-        "ACTION"  => ty.to_string(),
+        "DIR" => ty.to_string(),
+        "FILE" => ty.to_string(),
+        "ACTION" => ty.to_string(),
 
         // 'sigval' is a struct in Rust, but a union in C.
         "sigval" => format!("union sigval"),
@@ -5614,9 +5614,9 @@ fn test_aix(target: &str) {
             // POSIX-compliant versions in the system libc. As a result,
             // function pointer comparisons between the C and Rust sides
             // would fail.
-            "getpwuid_r" | "getpwnam_r" | "getgrgid_r" | "getgrnam_r"
-            | "aio_cancel" | "aio_error" | "aio_fsync" | "aio_read"
-            | "aio_return" | "aio_suspend" | "aio_write" | "select" => true,
+            "getpwuid_r" | "getpwnam_r" | "getgrgid_r" | "getgrnam_r" | "aio_cancel"
+            | "aio_error" | "aio_fsync" | "aio_read" | "aio_return" | "aio_suspend"
+            | "aio_write" | "select" => true,
 
             // 'getdtablesize' is a constant in the AIX header but it is
             // a real function in libc which the Rust side is resolved to.
@@ -5633,7 +5633,6 @@ fn test_aix(target: &str) {
         }
     });
 
-
     cfg.volatile_item(|i| {
         use ctest::VolatileItemKind::*;
         match i {

src/unix/mod.rs

@@ -336,7 +336,7 @@ pub const ATF_PUBL: c_int = 0x08;
 pub const ATF_USETRAILERS: c_int = 0x10;
 
 cfg_if! {
-    if #[cfg(any(target_os = "nto", target_os = "aix"))] {
+    if #[cfg(target_os = "nto")] {
         pub const FNM_PERIOD: c_int = 1 << 1;
     } else {
         pub const FNM_PERIOD: c_int = 1 << 2;
@@ -376,8 +376,6 @@ cfg_if! {
         pub const FNM_NOESCAPE: c_int = 1 << 0;
     } else if #[cfg(target_os = "nto")] {
         pub const FNM_NOESCAPE: c_int = 1 << 2;
-    } else if #[cfg(target_os = "aix")] {
-        pub const FNM_NOESCAPE: c_int = 1 << 3;
     } else {
         pub const FNM_NOESCAPE: c_int = 1 << 1;
     }