Hi, this title is too simple. Please change it to CryptoPkg: Fix redefinition error of int defines
-----Original Message----- From: Hou, Wenxing <wenxing....@intel.com> Sent: Wednesday, January 10, 2024 7:16 PM To: devel@edk2.groups.io Cc: Yao, Jiewen <jiewen....@intel.com>; Li, Yi1 <yi1...@intel.com>; Jiang, Guomin <guomin.ji...@intel.com> Subject: [PATCH] CryptoPkg: change the define REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4632 Move the define to stdint and add MACRO to prevent duplicate inclusion. Cc: Jiewen Yao <jiewen....@intel.com> Cc: Yi Li <yi1...@intel.com> Cc: Guomin Jiang <guomin.ji...@intel.com> Signed-off-by: Wenxing Hou <wenxing....@intel.com> --- CryptoPkg/Library/Include/CrtLibSupport.h | 15 --------------- CryptoPkg/Library/Include/stdint.h | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/CryptoPkg/Library/Include/CrtLibSupport.h b/CryptoPkg/Library/Include/CrtLibSupport.h index 76591f12cb..f36fe08f0c 100644 --- a/CryptoPkg/Library/Include/CrtLibSupport.h +++ b/CryptoPkg/Library/Include/CrtLibSupport.h @@ -424,19 +424,4 @@ 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 786d57e8d5..e1f54b412e 100644 --- a/CryptoPkg/Library/Include/stdint.h +++ b/CryptoPkg/Library/Include/stdint.h @@ -6,4 +6,23 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ +#ifndef CRYPTO_CRT_STDIO_H_ +#define CRYPTO_CRT_STDIO_H_ #include <CrtLibSupport.h> + +// +// 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 -- 2.26.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#113525): https://edk2.groups.io/g/devel/message/113525 Mute This Topic: https://groups.io/mt/103638765/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
