diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-08-27 18:46:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-27 18:46:54 +0200 |
| commit | 35af2b0edd5f4e6ae7a1c3159a0eaae5d548889e (patch) | |
| tree | 1ba9e83119af07e0c3931b1e7b946759b505d974 /thirdparty/mbedtls/library | |
| parent | 09086b0bb08808de3c1eb257ed7a83b0a0a61f8f (diff) | |
| parent | 8dab4a2aa3a078968e3df641ee607e1fb51ddfe2 (diff) | |
Merge pull request #64921 from bruvzg/win_arm
[Windows] Improve build environment detection, add support for Windows on ARM.
Diffstat (limited to 'thirdparty/mbedtls/library')
| -rw-r--r-- | thirdparty/mbedtls/library/timing.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/thirdparty/mbedtls/library/timing.c b/thirdparty/mbedtls/library/timing.c index 57bc9bcc12..78bfa10cfb 100644 --- a/thirdparty/mbedtls/library/timing.c +++ b/thirdparty/mbedtls/library/timing.c @@ -195,8 +195,10 @@ unsigned long mbedtls_timing_hardclock( void ) #endif /* !HAVE_HARDCLOCK && MBEDTLS_HAVE_ASM && __GNUC__ && __ia64__ */ -#if !defined(HAVE_HARDCLOCK) && defined(_MSC_VER) && \ +// -- GODOT start -- +#if !defined(HAVE_HARDCLOCK) && defined(_WIN32) && \ !defined(EFIX64) && !defined(EFI32) +// -- GODOT end -- #define HAVE_HARDCLOCK |