mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 17:33:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

WolfSSL - make it compilable also with older versions of Windows SDK.

Browse source 
followup 136e866119
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)
This commit is contained in:
Vladislav Vaintroub 2025-01-24 12:07:42 +01:00
parent 73f415c955
commit 40a23e08e6
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
extra/wolfssl/CMakeLists.txt
View file

@ -130,8 +130,9 @@ if(MSVC)
if(CMAKE_C_COMPILER_ID MATCHES Clang)
target_compile_options(wolfssl PRIVATE $<$<COMPILE_LANGUAGE:C>:-Wno-incompatible-function-pointer-types>)
endif()
remove_definitions(-DHAVE_CONFIG_H)
target_compile_definitions(wolfssl PRIVATE
_CRT_USE_CONFORMING_ANNEX_K_TIME HAVE_GMTIME_S WOLFSSL_HAVE_MIN WOLFSSL_HAVE_MAX)
WOLFSSL_HAVE_MIN WOLFSSL_HAVE_MAX)
endif()
CONFIGURE_FILE(user_settings.h.in user_settings.h)