From 2f9058096a1af480e781f630dbd3ad2fb15d7ed2 Mon Sep 17 00:00:00 2001 From: Denis Biryukov Date: Wed, 28 Feb 2024 16:42:00 +0100 Subject: [PATCH] merge fix --- examples/z_ping.c | 6 +++--- include/zenoh_commons.h | 14 -------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/examples/z_ping.c b/examples/z_ping.c index 44b5a4d09..fdc08f71d 100644 --- 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 index ab0898242..e0557abfb 100644 --- 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. *