merge fix

DenisBiryukov91 · Feb 28, 2024 · 2f90580 · 2f90580
1 parent aa4dbac
commit 2f90580
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 17 deletions.
diff --git a/examples/z_ping.c b/examples/z_ping.c
@@ -82,9 +82,9 @@ int main(int argc, char** argv) {
     for (int i = 0; i < args.number_of_pings; i++) {
         printf("%d bytes: seq=%d rtt=%luµs, lat=%luµs\n", args.size, i, results[i], results[i] / 2);
     }
-    zp_mutex_unlock(&mutex);
-    free(results);
-    free(data);
+    z_mutex_unlock(&mutex);
+    z_free(results);
+    z_free(data);
     z_drop(z_move(sub));
     z_drop(z_move(pub));
     z_close(z_move(session));

diff --git a/include/zenoh_commons.h b/include/zenoh_commons.h
@@ -491,20 +491,6 @@ typedef struct z_condvar_t {
 typedef struct z_mutex_t {
   size_t _0;
 } z_mutex_t;
-/**
- * Condvar
- *
- */
-typedef struct z_condvar_t {
-  size_t _0;
-} z_condvar_t;
-/**
- * Mutex
- *
- */
-typedef struct z_mutex_t {
-  size_t _0;
-} z_mutex_t;
 /**
  * An owned zenoh configuration.
  *