Fix includes for zephyr 3.2.99.

Signed-off-by: Achim Kraus <[email protected]>
eclipse · Aug 4, 2023 · dc13655 · dc13655
1 parent b3d8468
commit dc13655
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/dtls_debug.c b/dtls_debug.c
@@ -36,7 +36,7 @@
 
 #ifdef WITH_ZEPHYR
 #ifdef HAVE_NET_SOCKET_H
-#include <net/socket.h>
+#include <zephyr/net/socket.h>
 #endif /* HAVE_NET_SOCKET_H */
 typedef int in_port_t;
 #endif /* WITH_ZEPHYR */

diff --git a/dtls_debug.h b/dtls_debug.h
@@ -25,7 +25,7 @@
 #include "session.h"
 
 #ifdef WITH_ZEPHYR
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #endif /* WITH_ZEPHYR */
 
 #ifdef RIOT_VERSION

diff --git a/dtls_time.h b/dtls_time.h
@@ -55,7 +55,7 @@ typedef uint32_t clock_time_t;
 
 #elif defined(WITH_ZEPHYR)
 
-#include <zephyr.h>
+#include <zephyr/kernel.h>
 
 #ifndef CLOCK_SECOND
 # define CLOCK_SECOND 1000

diff --git a/platform-specific/dtls_prng_zephyr.c b/platform-specific/dtls_prng_zephyr.c
@@ -18,9 +18,10 @@
  *
  *******************************************************************************/
 
+#include <zephyr/random/rand32.h>
+
 #include "tinydtls.h"
 #include "dtls_prng.h"
-#include "random/rand32.h"
 
 int
 dtls_prng(unsigned char *buf, size_t len) {

diff --git a/session.h b/session.h
@@ -66,9 +66,9 @@ typedef struct {
 #else /* ! WITH_CONTIKI && ! WITH_RIOT_SOCK && ! WITH_LWIP_NO_SOCKET */
 
 #ifdef WITH_ZEPHYR
-#include <zephyr.h>
+#include <zephyr/kernel.h>
 #ifdef HAVE_NET_SOCKET_H
-#include <net/socket.h>
+#include <zephyr/net/socket.h>
 #endif /* HAVE_NET_SOCKET_H */
 
 #elif defined(WITH_LWIP)