Skip to content

Commit

Permalink
fix them for the correct feature-set
Browse files Browse the repository at this point in the history
  • Loading branch information
p-avital committed Aug 31, 2023
1 parent 8dddc37 commit 991af8b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions include/zenoh_commons.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
/**
Expand Down Expand Up @@ -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];
Expand Down
2 changes: 1 addition & 1 deletion src/commons.rs
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ impl From<Option<&Timestamp>> 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 {
Expand Down
4 changes: 2 additions & 2 deletions src/get.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ type ReplyInner = Option<Reply>;
/// 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))]
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);

Expand Down

0 comments on commit 991af8b

Please sign in to comment.