Merge pull request #6251 from PrinceOfPuppers/master

updated zephyr includes
wolfSSL · Apr 3, 2023 · a4a6a05 · a4a6a05
2 parents b1e4d49 + 9b1aed0
commit a4a6a05
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/wolfcrypt/src/random.c b/wolfcrypt/src/random.c
@@ -3577,11 +3577,11 @@ int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
 
 #elif defined(WOLFSSL_ZEPHYR)
 
-        #include <random/rand32.h>
+        #include <zephyr/random/rand32.h>
     #ifndef _POSIX_C_SOURCE
-        #include <posix/time.h>
+        #include <zephyr/posix/time.h>
     #else
-        #include <sys/time.h>
+        #include <time.h>
     #endif
 
         int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)

diff --git a/wolfssl/internal.h b/wolfssl/internal.h
@@ -194,7 +194,7 @@
     #endif
 #elif defined(WOLFSSL_ZEPHYR)
     #ifndef SINGLE_THREADED
-        #include <kernel.h>
+        #include <zephyr/kernel.h>
     #endif
 #elif defined(WOLFSSL_TELIT_M2MB)
     /* do nothing */

diff --git a/wolfssl/test.h b/wolfssl/test.h
@@ -140,7 +140,7 @@
 #elif defined(WOLFSSL_ZEPHYR)
     #include <string.h>
     #include <sys/types.h>
-    #include <net/socket.h>
+    #include <zephyr/net/socket.h>
     #define SOCKET_T int
     #define SOL_SOCKET 1
     #define WOLFSSL_USE_GETADDRINFO

diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h
@@ -1748,9 +1748,9 @@ extern void uITRON4_free(void *p) ;
 #endif /*(WOLFSSL_APACHE_MYNEWT)*/
 
 #ifdef WOLFSSL_ZEPHYR
-    #include <zephyr.h>
-    #include <sys/printk.h>
-    #include <sys/util.h>
+    #include <zephyr/kernel.h>
+    #include <zephyr/sys/printk.h>
+    #include <zephyr/sys/util.h>
     #include <stdlib.h>
 
     #define WOLFSSL_DH_CONST

diff --git a/wolfssl/wolfcrypt/wc_port.h b/wolfssl/wolfcrypt/wc_port.h
@@ -139,7 +139,7 @@
     /* do nothing */
 #elif defined(WOLFSSL_ZEPHYR)
     #ifndef SINGLE_THREADED
-        #include <kernel.h>
+        #include <zephyr/kernel.h>
     #endif
 #elif defined(WOLFSSL_TELIT_M2MB)
 
@@ -508,7 +508,7 @@ WOLFSSL_ABI WOLFSSL_API int wolfCrypt_Cleanup(void);
     #define XFGETS(b,s,f) -2 /* Not ported yet */
 
 #elif defined(WOLFSSL_ZEPHYR)
-    #include <fs/fs.h>
+    #include <zephyr/fs/fs.h>
 
     #define XFILE      struct fs_file_t*
     #define STAT       struct fs_dirent
@@ -913,7 +913,7 @@ WOLFSSL_ABI WOLFSSL_API int wolfCrypt_Cleanup(void);
 
 #elif defined(WOLFSSL_ZEPHYR)
     #ifndef _POSIX_C_SOURCE
-        #include <posix/time.h>
+        #include <zephyr/posix/time.h>
     #else
         #include <sys/time.h>
     #endif

diff --git a/wolfssl/wolfio.h b/wolfssl/wolfio.h
@@ -127,7 +127,7 @@
         #include <lwip-socket.h>
         #include <errno.h>
     #elif defined(WOLFSSL_ZEPHYR)
-        #include <net/socket.h>
+        #include <zephyr/net/socket.h>
     #elif defined(MICROCHIP_PIC32)
         #include <sys/errno.h>
     #elif defined(HAVE_NETX)

diff --git a/zephyr/zephyr_init.c b/zephyr/zephyr_init.c
@@ -25,7 +25,7 @@
  * Initialize the wolfSSL library.
  */
 
-#include <init.h>
+#include <zephyr/init.h>
 
 #include "user_settings.h"
 #include "wolfssl/ssl.h"