diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-10 09:11:16 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-10 09:15:00 +0100 |
| commit | 8189abd64a0871871fbae5a8e94753b99a2af2ae (patch) | |
| tree | 93901952ca42a555a2028653abf4c239221f886a /thirdparty/mbedtls/include | |
| parent | f70b5fa30cd91f0375b43efae7de5d9d7151130c (diff) | |
mbedtls: Re-add patch to disable VIA padlock
The comment mentioned a conflict with libwebsockets, but we actually
still get this conflict even now that we don't use libwebsockets.
Not sure what component is clashing but we should basically just keep
this patch.
Follow-up to #36823.
Diffstat (limited to 'thirdparty/mbedtls/include')
| -rw-r--r-- | thirdparty/mbedtls/include/mbedtls/config.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/thirdparty/mbedtls/include/mbedtls/config.h b/thirdparty/mbedtls/include/mbedtls/config.h index 834cced87f..8d9c31a504 100644 --- a/thirdparty/mbedtls/include/mbedtls/config.h +++ b/thirdparty/mbedtls/include/mbedtls/config.h @@ -2542,7 +2542,9 @@ * * This modules adds support for the VIA PadLock on x86. */ -#define MBEDTLS_PADLOCK_C +// -- GODOT start -- +// #define MBEDTLS_PADLOCK_C +// -- GODOT end -- /** * \def MBEDTLS_PEM_PARSE_C |