Skip to content

Commit f1d47d5

Browse files
committed
Fix includes for zephyr 3.2.99.
Signed-off-by: Achim Kraus <achim.kraus@cloudcoap.net>
1 parent 9afb881 commit f1d47d5

5 files changed

Lines changed: 7 additions & 6 deletions

File tree

dtls_debug.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
#ifdef WITH_ZEPHYR
3838
#ifdef HAVE_NET_SOCKET_H
39-
#include <net/socket.h>
39+
#include <zephyr/net/socket.h>
4040
#endif /* HAVE_NET_SOCKET_H */
4141
typedef int in_port_t;
4242
#endif /* WITH_ZEPHYR */

dtls_debug.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "session.h"
2626

2727
#ifdef WITH_ZEPHYR
28-
#include <logging/log.h>
28+
#include <zephyr/logging/log.h>
2929
#endif /* WITH_ZEPHYR */
3030

3131
#ifdef RIOT_VERSION

dtls_time.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ typedef uint32_t clock_time_t;
5555

5656
#elif defined(WITH_ZEPHYR)
5757

58-
#include <zephyr.h>
58+
#include <zephyr/kernel.h>
5959

6060
#ifndef CLOCK_SECOND
6161
# define CLOCK_SECOND 1000

platform-specific/dtls_prng_zephyr.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@
1818
*
1919
*******************************************************************************/
2020

21+
#include <zephyr/random/rand32.h>
22+
2123
#include "tinydtls.h"
2224
#include "dtls_prng.h"
23-
#include "random/rand32.h"
2425

2526
int
2627
dtls_prng(unsigned char *buf, size_t len) {

session.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ typedef struct {
6666
#else /* ! WITH_CONTIKI && ! WITH_RIOT_SOCK && ! WITH_LWIP_NO_SOCKET */
6767

6868
#ifdef WITH_ZEPHYR
69-
#include <zephyr.h>
69+
#include <zephyr/kernel.h>
7070
#ifdef HAVE_NET_SOCKET_H
71-
#include <net/socket.h>
71+
#include <zephyr/net/socket.h>
7272
#endif /* HAVE_NET_SOCKET_H */
7373

7474
#elif defined(WITH_LWIP)

0 commit comments

Comments
 (0)