From 991af8b7a124dd2117dd699c59b93802cc44504d Mon Sep 17 00:00:00 2001 From: Pierre Avital Date: Thu, 31 Aug 2023 16:05:16 +0200 Subject: [PATCH] fix them for the correct feature-set --- include/zenoh_commons.h | 6 +++--- src/commons.rs | 2 +- src/get.rs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/zenoh_commons.h b/include/zenoh_commons.h index 359caa158..033d1d164 100644 --- a/include/zenoh_commons.h +++ b/include/zenoh_commons.h @@ -222,7 +222,7 @@ typedef struct z_owned_closure_query_t { */ #if defined(TARGET_ARCH_X86_64) typedef struct ALIGN(8) z_owned_reply_t { - uint64_t _0[22]; + uint64_t _0[23]; } z_owned_reply_t; #endif #if defined(TARGET_ARCH_AARCH64) @@ -232,7 +232,7 @@ typedef struct ALIGN(16) z_owned_reply_t { #endif #if defined(TARGET_ARCH_ARM) typedef struct ALIGN(8) z_owned_reply_t { - uint64_t _0[16]; + uint64_t _0[17]; } z_owned_reply_t; #endif /** @@ -662,7 +662,7 @@ typedef struct z_subscriber_t { */ typedef struct zc_owned_payload_t { struct z_bytes_t payload; - uintptr_t _owner[4]; + uintptr_t _owner[5]; } zc_owned_payload_t; typedef struct zc_owned_shmbuf_t { uintptr_t _0[9]; diff --git a/src/commons.rs b/src/commons.rs index 74dee675d..e151da43a 100644 --- a/src/commons.rs +++ b/src/commons.rs @@ -96,7 +96,7 @@ impl From> for z_timestamp_t { #[repr(C)] pub struct zc_owned_payload_t { pub payload: z_bytes_t, - pub _owner: [usize; 4], + pub _owner: [usize; 5], } impl Default for zc_owned_payload_t { fn default() -> Self { diff --git a/src/get.rs b/src/get.rs index f7a4d3201..ddca8c9c9 100644 --- a/src/get.rs +++ b/src/get.rs @@ -44,7 +44,7 @@ type ReplyInner = Option; /// To check if `val` is still valid, you may use `z_X_check(&val)` (or `z_check(val)` if your compiler supports `_Generic`), which will return `true` if `val` is valid. #[cfg(target_arch = "x86_64")] #[repr(C, align(8))] -pub struct z_owned_reply_t([u64; 22]); +pub struct z_owned_reply_t([u64; 23]); #[cfg(target_arch = "aarch64")] #[repr(C, align(16))] @@ -52,7 +52,7 @@ pub struct z_owned_reply_t([u64; 24]); #[cfg(target_arch = "arm")] #[repr(C, align(8))] -pub struct z_owned_reply_t([u64; 16]); +pub struct z_owned_reply_t([u64; 17]); impl_guarded_transmute!(ReplyInner, z_owned_reply_t);