Rebase fix

eclipse-zenoh · Dec 12, 2024 · 4c7a5b9 · 4c7a5b9
1 parent d423ae4
commit 4c7a5b9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/transport/common/transport.c b/src/transport/common/transport.c
@@ -16,7 +16,7 @@
 #include <stdbool.h>
 
 #include "zenoh-pico/link/link.h"
-#include "zenoh-pico/system/platform_common.h"
+#include "zenoh-pico/system/common/platform.h"
 #include "zenoh-pico/utils/result.h"
 
 void _z_common_transport_clear(_z_transport_common_t *ztc, bool detach_tasks) {

diff --git a/src/transport/unicast/lease.c b/src/transport/unicast/lease.c
@@ -12,12 +12,11 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 //
 
-#include "zenoh-pico/transport/unicast/lease.h"
-
 #include "zenoh-pico/session/query.h"
-#include "zenoh-pico/system/platform_common.h"
+#include "zenoh-pico/system/common/platform.h"
 #include "zenoh-pico/transport/common/tx.h"
 #include "zenoh-pico/transport/transport.h"
+#include "zenoh-pico/transport/unicast/lease.h"
 #include "zenoh-pico/transport/unicast/transport.h"
 #include "zenoh-pico/utils/logging.h"
 

diff --git a/src/transport/unicast/transport.c b/src/transport/unicast/transport.c
@@ -11,17 +11,16 @@
 // Contributors:
 //   ZettaScale Zenoh Team, <[email protected]>
 
-#include "zenoh-pico/transport/common/transport.h"
-
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "zenoh-pico/link/link.h"
-#include "zenoh-pico/system/platform_common.h"
+#include "zenoh-pico/system/common/platform.h"
 #include "zenoh-pico/transport/common/rx.h"
+#include "zenoh-pico/transport/common/transport.h"
 #include "zenoh-pico/transport/common/tx.h"
 #include "zenoh-pico/transport/unicast/transport.h"
 #include "zenoh-pico/transport/utils.h"