Revert "Move struct ntptimeval from gnu to gnu/b*"

snogge · Sep 13, 2023 · 115f81f · 115f81f
1 parent 1f9f022
commit 115f81f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 21 deletions.
diff --git a/src/unix/linux_like/linux/gnu/b32/mod.rs b/src/unix/linux_like/linux/gnu/b32/mod.rs
@@ -182,17 +182,6 @@ s! {
         __glibc_reserved4: ::__syscall_ulong_t,
     }
 
-    pub struct ntptimeval {
-        pub time: ::timeval,
-        pub maxerror: ::c_long,
-        pub esterror: ::c_long,
-        pub tai: ::c_long,
-        pub __glibc_reserved1: ::c_long,
-        pub __glibc_reserved2: ::c_long,
-        pub __glibc_reserved3: ::c_long,
-        pub __glibc_reserved4: ::c_long,
-    }
-
     pub struct timex {
         pub modes: ::c_uint,
         pub __unused_pad1: i32,

diff --git a/src/unix/linux_like/linux/gnu/b64/mod.rs b/src/unix/linux_like/linux/gnu/b64/mod.rs
@@ -14,6 +14,8 @@ pub type __syscall_ulong_t = ::c_ulonglong;
 #[cfg(not(all(target_arch = "x86_64", target_pointer_width = "32")))]
 pub type __syscall_ulong_t = ::c_ulong;
 
+use ntptimeval;
+
 cfg_if! {
     if #[cfg(all(target_arch = "aarch64", target_pointer_width = "32"))] {
         pub type clock_t = i32;
@@ -90,17 +92,7 @@ s! {
         pub sem_nsems: ::__syscall_ulong_t,
         __glibc_reserved3: ::__syscall_ulong_t,
         __glibc_reserved4: ::__syscall_ulong_t,
-    }
 
-    pub struct ntptimeval {
-        pub time: ::timeval,
-        pub maxerror: ::c_long,
-        pub esterror: ::c_long,
-        pub tai: ::c_long,
-        pub __glibc_reserved1: ::c_long,
-        pub __glibc_reserved2: ::c_long,
-        pub __glibc_reserved3: ::c_long,
-        pub __glibc_reserved4: ::c_long,
     }
 
     pub struct timex {

diff --git a/src/unix/linux_like/linux/gnu/mod.rs b/src/unix/linux_like/linux/gnu/mod.rs
@@ -197,6 +197,16 @@ s! {
         pub rt_irtt: ::c_ushort,
     }
 
+    pub struct ntptimeval {
+        pub time: ::timeval,
+        pub maxerror: ::c_long,
+        pub esterror: ::c_long,
+        pub tai: ::c_long,
+        pub __glibc_reserved1: ::c_long,
+        pub __glibc_reserved2: ::c_long,
+        pub __glibc_reserved3: ::c_long,
+        pub __glibc_reserved4: ::c_long,
+    }
 
     pub struct regex_t {
         __buffer: *mut ::c_void,