Change postion of sys/types.h

Author: night1rider

.wolfssl_known_macro_extras

@@ -1098,11 +1098,8 @@ __clang_major__
 __cplusplus
 __ghc__
 __ghs__
-<<<<<<< HEAD
 __has_attribute
-=======
 __has_include
->>>>>>> 9188ee19b (Add to macro list)
 __hpux__
 __i386
 __i386__

wolfcrypt/src/random.c

@@ -3457,6 +3457,8 @@ int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
         #include <version.h>
     #endif
 
+    #include <sys/types.h>
+
     #if KERNEL_VERSION_NUMBER >= 0x30500
         #include <zephyr/random/random.h>
     #else
@@ -3467,14 +3469,14 @@ int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
         #endif
     #endif
 
-    #if KERNEL_VERSION_NUMBER >= 0x30100
-        #include <time.h>
-    #else
-        #ifndef _POSIX_C_SOURCE
-            #include <posix/time.h>
+    #ifndef _POSIX_C_SOURCE
+        #if KERNEL_VERSION_NUMBER >= 0x30100
+            #include <zephyr/posix/time.h>
         #else
-            #include <time.h>
+            #include <posix/time.h>
         #endif
+    #else
+        #include <time.h>
     #endif
 
     int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)

wolfssl/wolfcrypt/wc_port.h

@@ -1539,14 +1539,23 @@ WOLFSSL_ABI WOLFSSL_API int wolfCrypt_Cleanup(void);
     #else
         #include <version.h>
     #endif
-    #if KERNEL_VERSION_NUMBER >= 0x30100
-        #include <time.h>
-    #else
-        #ifndef _POSIX_C_SOURCE
-            #include <posix/time.h>
+    #include <sys/types.h>
+    #ifndef _POSIX_C_SOURCE
+        #if KERNEL_VERSION_NUMBER >= 0x30100
+            #ifdef __has_include
+                #if __has_include(<zephyr/posix/time.h>)
+                    #include <zephyr/posix/time.h>
+                #else
+                    #include <time.h>
+                #endif
+            #else
+                #include <zephyr/posix/time.h>
+            #endif
         #else
-            #include <time.h>
+            #include <posix/time.h>
         #endif
+    #else
+        #include <time.h>
     #endif
 
     #ifndef CLOCK_REALTIME