summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-01-01 19:15:46 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2021-01-02 11:56:41 +0200
commitc1a7a82bcac4b8694bdb79c665b42de7a3865d05 (patch)
tree7ccb506e49974c1f7f542531153050782036004c /extra
parent3454b5cf35a61e8f6cfab376638520dee4a50609 (diff)
downloadmariadb-git-c1a7a82bcac4b8694bdb79c665b42de7a3865d05.tar.gz
WolfSSL v4.6.0-stable
Diffstat (limited to 'extra')
-rw-r--r--extra/wolfssl/CMakeLists.txt2
m---------extra/wolfssl/wolfssl0
2 files changed, 1 insertions, 1 deletions
diff --git a/extra/wolfssl/CMakeLists.txt b/extra/wolfssl/CMakeLists.txt
index 953d377ebcf..566106abb86 100644
--- a/extra/wolfssl/CMakeLists.txt
+++ b/extra/wolfssl/CMakeLists.txt
@@ -44,7 +44,7 @@ ADD_DEFINITIONS(-DWOLFSSL_LIB -DBUILDING_WOLFSSL)
INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/wolfssl)
IF(MSVC)
# size_t to long truncation warning
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -wd4267 -wd4334 -wd4028")
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -wd4267 -wd4334 -wd4028 -wd4244")
ENDIF()
ADD_CONVENIENCE_LIBRARY(wolfssl ${WOLFSSL_SOURCES})
diff --git a/extra/wolfssl/wolfssl b/extra/wolfssl/wolfssl
-Subproject e116c89a58af750421d82ece13f80516d2bde02
+Subproject 9c87f979a7f1d3a6d786b260653d566c1d31a1c