Looks good to me.
Reviewed-by: Yi Li <yi1...@intel.com>
-----Original Message-----
From: Hou, Wenxing <wenxing....@intel.com>
Sent: Thursday, January 4, 2024 4:20 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 1/1] 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 <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 | 10 ----------
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/CryptoPkg/Library/Include/CrtLibSupport.h
b/CryptoPkg/Library/Include/CrtLibSupport.h
index f36fe08f0c61..76591f12cb67 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+ #endifdiff --git
a/CryptoPkg/Library/Include/stdint.h b/CryptoPkg/Library/Include/stdint.h
index 17b8c767d7be..786d57e8d53d 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 <CrtLibSupport.h>--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;--
2.26.2.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#113152): https://edk2.groups.io/g/devel/message/113152
Mute This Topic: https://groups.io/mt/103519077/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
