Fix mismatch of constants

Signed-off-by: Florian Bartels <[email protected]>
rust-lang · Dec 19, 2024 · f92715a · f92715a
1 parent dcd0ba9
commit f92715a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/libc-test/build.rs b/libc-test/build.rs
@@ -3035,7 +3035,7 @@ fn test_neutrino(target: &str) {
     let mut cfg = ctest_cfg();
     if target.ends_with("_iosock") {
         let qnx_target_val = std::env::var("QNX_TARGET")
-        .unwrap_or_else(|_| "QNX_TARGET_not_set_please_source_qnxsdp".into());
+            .unwrap_or_else(|_| "QNX_TARGET_not_set_please_source_qnxsdp".into());
 
         cfg.include(qnx_target_val + "/usr/include/io-sock");
         headers! { cfg:
@@ -3204,9 +3204,6 @@ fn test_neutrino(target: &str) {
             // Does not exist in Neutrino
             "locale_t" => true,
 
-            // `c_char_def` is always public but not always reexported.
-            "c_char_def" => true,
-
             // FIXME: "'__uint128' undeclared" in C
             "__uint128" => true,
 

diff --git a/libc-test/cc-rs b/libc-test/cc-rs
diff --git a/libc-test/ctest2 b/libc-test/ctest2
diff --git a/src/unix/nto/mod.rs b/src/unix/nto/mod.rs
@@ -1279,7 +1279,6 @@ cfg_if! {
         pub const IFF_NOTRAILERS: c_int = 0x00000020;
         pub const AF_INET6: c_int = 24;
         pub const AF_BLUETOOTH: c_int = 31;
-        pub const AF_BLUETOOTH: c_int = 36;
         pub const pseudo_AF_KEY: c_int = 29;
         pub const MSG_NOSIGNAL: c_int = 0x0800;
         pub const MSG_WAITFORONE: c_int = 0x2000;
@@ -1331,7 +1330,7 @@ cfg_if! {
         pub const KERN_MAXID: c_int = 83;
         pub const KERN_PROC_ARGS: c_int = 48;
         pub const KERN_PROC_ENV: c_int = 3;
-        pub const KERN_PROC_GID: c_int = 11;
+        pub const KERN_PROC_GID: c_int = 7;
         pub const KERN_PROC_RGID: c_int = 8;
         pub const LOCAL_CONNWAIT: c_int = 0x0002;
         pub const LOCAL_CREDS: c_int = 0x0001;
@@ -1376,7 +1375,7 @@ cfg_if! {
         pub const KERN_LOGSIGEXIT: c_int = 34;
         pub const KERN_PROC_ARGS: c_int = 7;
         pub const KERN_PROC_ENV: c_int = 35;
-        pub const KERN_PROC_GID: c_int = 7;
+        pub const KERN_PROC_GID: c_int = 11;
         pub const KERN_PROC_RGID: c_int = 10;
         pub const LOCAL_CONNWAIT: c_int = 4;
         pub const LOCAL_CREDS: c_int = 2;