build with shm passed

Author: milyin

include/zenoh_commons.h

@@ -25,9 +25,9 @@ use crate::{
 };
 
 decl_c_type!(
-    owned(z_owned_shm_t, Option<ZShm>),
+    owned(z_owned_shm_t, option ZShm),
     loaned(z_loaned_shm_t, zshm),
-    moved(z_moved_shm_t, ZShm)
+    moved(z_moved_shm_t)
 );
 
 /// Constructs ZShm slice from ZShmMut slice

include/zenoh_macros.h

@@ -22,9 +22,9 @@ use crate::{
 };
 
 decl_c_type!(
-    owned(z_owned_shm_mut_t, Option<ZShmMut>),
+    owned(z_owned_shm_mut_t, option ZShmMut),
     loaned(z_loaned_shm_mut_t, zshmmut),
-    moved(z_moved_shm_mut_t, ZShmMut)
+    moved(z_moved_shm_mut_t)
 );
 
 /// Tries to construct ZShmMut slice from ZShm slice

src/shm/buffer/zshm.rs

@@ -42,8 +42,9 @@ pub struct zc_shm_client_callbacks_t {
     ) -> bool,
 }
 
-decl_c_type!(owned(z_owned_shm_client_t, Option<Arc<dyn ShmClient>>),
-    moved (z_moved_shm_client_t, Arc<dyn ShmClient>)
+decl_c_type!(
+    owned(z_owned_shm_client_t, option Arc<dyn ShmClient>),
+    moved(z_moved_shm_client_t)
 );
 
 #[derive(Debug)]

src/shm/buffer/zshmmut.rs

@@ -48,8 +48,8 @@ pub enum CSHMLayout {
 }
 
 decl_c_type!(
-    owned(z_owned_alloc_layout_t, Option<CSHMLayout>),
-    loaned(z_loaned_alloc_layout_t, CSHMLayout),
+    owned(z_owned_alloc_layout_t, option CSHMLayout),
+    loaned(z_loaned_alloc_layout_t),
 moved(z_moved_alloc_layout_t)
 );
 

src/shm/client/shm_client.rs

@@ -72,12 +72,10 @@ pub struct z_alloc_alignment_t {
 
 decl_c_type!(copy(z_alloc_alignment_t, AllocAlignment),);
 
-decl_c_type!(
-    inequal
-    owned(z_owned_memory_layout_t, 
-         Option<MemoryLayout>),
-    loaned(z_loaned_memory_layout_t, MemoryLayout),
-moved(z_moved_memory_layout_t)
+decl_c_type_inequal!(
+    owned(z_owned_memory_layout_t, option MemoryLayout),
+    loaned(z_loaned_memory_layout_t),
+    moved(z_moved_memory_layout_t)
 );
 
 /// Creates a new Memory Layout
@@ -141,9 +139,9 @@ pub extern "C" fn z_memory_layout_get_data(
 }
 
 decl_c_type!(
-    owned(z_owned_chunk_alloc_result_t, Option<ChunkAllocResult>),
-    loaned(z_loaned_chunk_alloc_result_t, ChunkAllocResult),
-moved(z_moved_chunk_alloc_result_t)
+    owned(z_owned_chunk_alloc_result_t, option ChunkAllocResult),
+    loaned(z_loaned_chunk_alloc_result_t),
+    moved(z_moved_chunk_alloc_result_t)
 );
 
 /// Creates a new Chunk Alloc Result with Ok value
@@ -195,12 +193,10 @@ pub unsafe extern "C" fn z_chunk_alloc_result_loan(
 #[allow(unused_variables)]
 pub extern "C" fn z_chunk_alloc_result_drop(this: z_moved_chunk_alloc_result_t) {}
 
-decl_c_type!(
-    inequal
-    owned(z_owned_buf_alloc_result_t, 
-        Option<BufAllocResult>),
-    loaned(z_loaned_buf_alloc_result_t, BufAllocResult),
-moved(z_moved_buf_alloc_result_t)
+decl_c_type_inequal!(
+    owned(z_owned_buf_alloc_result_t, option BufAllocResult),
+    loaned(z_loaned_buf_alloc_result_t),
+    moved(z_moved_buf_alloc_result_t)
 );
 
 #[no_mangle]