Skip to content

Commit 40a23e0

Browse files
committed
WolfSSL - make it compilable also with older versions of Windows SDK.
followup 136e866 Remove HAVE_CONFIG_H from wolfssl compilation. WolfSSL knows about it, and would include server's config.h, which is mostly fine, but server pretends to have HAVE_GMTIME_R on Windows, which leads to compilation problems. In any case, on Windows, there is no need for config.h for WolfSSL, and no need for gmtime_r/_s(), as gmtime() is thread-safe on Windpows (it returns pointer to thread-local struct)
1 parent 73f415c commit 40a23e0

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

extra/wolfssl/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,9 @@ if(MSVC)
130130
if(CMAKE_C_COMPILER_ID MATCHES Clang)
131131
target_compile_options(wolfssl PRIVATE $<$<COMPILE_LANGUAGE:C>:-Wno-incompatible-function-pointer-types>)
132132
endif()
133+
remove_definitions(-DHAVE_CONFIG_H)
133134
target_compile_definitions(wolfssl PRIVATE
134-
_CRT_USE_CONFORMING_ANNEX_K_TIME HAVE_GMTIME_S WOLFSSL_HAVE_MIN WOLFSSL_HAVE_MAX)
135+
WOLFSSL_HAVE_MIN WOLFSSL_HAVE_MAX)
135136
endif()
136137

137138
CONFIGURE_FILE(user_settings.h.in user_settings.h)

0 commit comments

Comments
 (0)