Fix issue due to min/max not being avaliable for older builds in CI

Author: night1rider

zephyr/CMakeLists.txt

@@ -186,6 +186,13 @@ if(CONFIG_WOLFSSL)
 
         target_compile_definitions(wolfSSL INTERFACE WOLFSSL_ZEPHYR)
         target_compile_definitions(wolfSSL INTERFACE WOLFSSL_USER_SETTINGS)
+
+    # Zephyr >= 4.1 provides min()/max() macros in sys/util.h that collide
+    # with wolfSSL's static inline definitions in misc.c
+    if(KERNEL_VERSION_MAJOR GREATER_EQUAL 5 OR
+       (KERNEL_VERSION_MAJOR EQUAL 4 AND KERNEL_VERSION_MINOR GREATER_EQUAL 1))
+      target_compile_definitions(wolfSSL INTERFACE WOLFSSL_HAVE_MIN_MAX)
+    endif()
     if(CONFIG_WOLFSSL_DEBUG)
       target_compile_definitions(wolfSSL INTERFACE DEBUG_WOLFSSL)
       zephyr_library_compile_options(-g3 -O0)

zephyr/user_settings.h

@@ -40,8 +40,10 @@ extern "C" {
 /* ------------------------------------------------------------------------- */
 /* Platform */
 /* ------------------------------------------------------------------------- */
+#ifdef WOLFSSL_HAVE_MIN_MAX
 #define WOLFSSL_HAVE_MIN /* Zephyr provides min() in sys/util.h */
 #define WOLFSSL_HAVE_MAX /* Zephyr provides max() in sys/util.h */
+#endif
 #define WOLFSSL_GENERAL_ALIGNMENT 4 /* platform requires 32-bit alignment on uint32_t */
 #define SIZEOF_LONG_LONG 8          /* long long is 8 bytes / 64-bit */
 //#define WOLFSSL_NO_ASM /* optionally disable inline assembly support */