diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2018-07-28 15:40:40 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-28 15:40:40 +0200 |
commit | 04ec0bf5e1714131d31421f59083578236274ff7 (patch) | |
tree | a2169e7883b981521a9900b76f7cbd9af1df1fac /thirdparty/mbedtls/library/timing.c | |
parent | bdbc63c4eeeb43176d48b40fb713e793c40a1f3d (diff) | |
parent | d8e1cd7a109bc832826f21d6df1faf401be8dcc9 (diff) | |
download | redot-engine-04ec0bf5e1714131d31421f59083578236274ff7.tar.gz |
Merge pull request #20539 from akien-mga/mbedtls-2.12.0
mbedtls: Update to upstream version 2.12.0
Diffstat (limited to 'thirdparty/mbedtls/library/timing.c')
-rw-r--r-- | thirdparty/mbedtls/library/timing.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/thirdparty/mbedtls/library/timing.c b/thirdparty/mbedtls/library/timing.c index 6a30e51259..3e8139f1f9 100644 --- a/thirdparty/mbedtls/library/timing.c +++ b/thirdparty/mbedtls/library/timing.c @@ -39,7 +39,8 @@ #if !defined(MBEDTLS_TIMING_ALT) #if !defined(unix) && !defined(__unix__) && !defined(__unix) && \ - !defined(__APPLE__) && !defined(_WIN32) && !defined(__QNXNTO__) + !defined(__APPLE__) && !defined(_WIN32) && !defined(__QNXNTO__) && \ + !defined(__HAIKU__) #error "This module only works on Unix and Windows, see MBEDTLS_TIMING_C in config.h" #endif |