From e449451770193c8eb36e4dc3a770c8ee353183aa Mon Sep 17 00:00:00 2001 From: "Hou, Wenxing" Date: Thu, 4 Jan 2024 16:19:55 +0800 Subject: CryptoPkg: move define to CrtLibSupport REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4632 The before code will cause redefine error. This patch move them to CrtLibSupport header. But Openssl has already defined them internally, need to increase support for OPENSLL_SYS_UEFI judgment. Cc: Jiewen Yao Cc: Yi Li Cc: Guomin Jiang Signed-off-by: Wenxing Hou Reviewed-by: Yi Li --- CryptoPkg/Library/Include/CrtLibSupport.h | 15 +++++++++++++++ CryptoPkg/Library/Include/stdint.h | 10 ---------- 2 files changed, 15 insertions(+), 10 deletions(-) (limited to 'CryptoPkg') diff --git a/CryptoPkg/Library/Include/CrtLibSupport.h b/CryptoPkg/Library/Include/CrtLibSupport.h index f36fe08..76591f1 100644 --- a/CryptoPkg/Library/Include/CrtLibSupport.h +++ b/CryptoPkg/Library/Include/CrtLibSupport.h @@ -424,4 +424,19 @@ strcpy ( #define atoi(nptr) AsciiStrDecimalToUintn(nptr) #define gettimeofday(tvp, tz) do { (tvp)->tv_sec = time(NULL); (tvp)->tv_usec = 0; } while (0) +// +// only use in Mbedlts. The Openssl has defined them internally. +// +#ifndef OPENSSL_SYS_UEFI +typedef INT8 int8_t; +typedef UINT8 uint8_t; +typedef INT16 int16_t; +typedef UINT16 uint16_t; +typedef INT32 int32_t; +typedef UINT32 uint32_t; +typedef INT64 int64_t; +typedef UINT64 uint64_t; +typedef UINTN uintptr_t; +#endif + #endif diff --git a/CryptoPkg/Library/Include/stdint.h b/CryptoPkg/Library/Include/stdint.h index 17b8c76..786d57e 100644 --- a/CryptoPkg/Library/Include/stdint.h +++ b/CryptoPkg/Library/Include/stdint.h @@ -7,13 +7,3 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ #include - -typedef INT8 int8_t; -typedef UINT8 uint8_t; -typedef INT16 int16_t; -typedef UINT16 uint16_t; -typedef INT32 int32_t; -typedef UINT32 uint32_t; -typedef INT64 int64_t; -typedef UINT64 uint64_t; -typedef UINTN uintptr_t; -- cgit v1.1