diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-11-08 10:41:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-08 10:41:17 +0100 |
| commit | 90edd839d5f67d4252923a720feeef6ad0d76107 (patch) | |
| tree | a1dd3ae46bf575cb8296df38568dfce237c6ecd8 /modules/mbedtls | |
| parent | 30b6db99a99a94c64d906c1b828ff44f79a1bc75 (diff) | |
| parent | 127458ed175c5aeac8dee7f09d23fae4c8928eb7 (diff) | |
Merge pull request #43385 from reduz/reorganize-core
Reorganize and clean up core/ directory
Diffstat (limited to 'modules/mbedtls')
| -rw-r--r-- | modules/mbedtls/crypto_mbedtls.cpp | 4 | ||||
| -rw-r--r-- | modules/mbedtls/crypto_mbedtls.h | 2 | ||||
| -rw-r--r-- | modules/mbedtls/ssl_context_mbedtls.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/modules/mbedtls/crypto_mbedtls.cpp b/modules/mbedtls/crypto_mbedtls.cpp index 12a982df6e..bec792450a 100644 --- a/modules/mbedtls/crypto_mbedtls.cpp +++ b/modules/mbedtls/crypto_mbedtls.cpp @@ -32,10 +32,10 @@ #include "core/os/file_access.h" -#include "core/engine.h" +#include "core/config/engine.h" +#include "core/config/project_settings.h" #include "core/io/certs_compressed.gen.h" #include "core/io/compression.h" -#include "core/project_settings.h" #ifdef TOOLS_ENABLED #include "editor/editor_settings.h" diff --git a/modules/mbedtls/crypto_mbedtls.h b/modules/mbedtls/crypto_mbedtls.h index 2a446f9d48..e40ca08643 100644 --- a/modules/mbedtls/crypto_mbedtls.h +++ b/modules/mbedtls/crypto_mbedtls.h @@ -32,7 +32,7 @@ #define CRYPTO_MBEDTLS_H #include "core/crypto/crypto.h" -#include "core/resource.h" +#include "core/io/resource.h" #include <mbedtls/ctr_drbg.h> #include <mbedtls/entropy.h> diff --git a/modules/mbedtls/ssl_context_mbedtls.h b/modules/mbedtls/ssl_context_mbedtls.h index baaeb6eb85..96703a7eb7 100644 --- a/modules/mbedtls/ssl_context_mbedtls.h +++ b/modules/mbedtls/ssl_context_mbedtls.h @@ -35,7 +35,7 @@ #include "core/os/file_access.h" -#include "core/reference.h" +#include "core/object/reference.h" #include <mbedtls/config.h> #include <mbedtls/ctr_drbg.h> |