From nobody Fri May 17 06:07:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+113524+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+113524+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1704885360; cv=none; d=zohomail.com; s=zohoarc; b=Zjx4Wufd86caYIN3uDV1BJdLdqr6PwgRt7tH28cSzvm2AZsh8X+AMiIz3U1ZNinsi29sNxyXHUopnVXpQmdJoDd37qJufJMQy5yUGx4ahJqV2c9Kt1iZnPcP1LkEn0vKLnx8E08/yJMleicZZV8+NamgJNefUL03rhDnrBGGnWw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1704885360; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:Sender:Subject:Subject:To:To:Message-Id; bh=4YK0S5JkbWxGr/BQKaKcIPtdmR0UobVI/hnytRs37tk=; b=fa7qyhZOYOPvvEua1ObU7lyK/ztOXp+AffIW1O4Vw/fa2QvHomGW/pKagvb8Oo86CAKL+3kT4m5gM/dwLlxUDWn+fkvycoU/V5VtzoAwLoHwf4pipEt4AyoN1D9MCqIZPS8MEHTQILGcwV1Y/jk7FaeqdtdOJ9TO2ktj6oZGug8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+113524+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1704885360529159.6390193359607; Wed, 10 Jan 2024 03:16:00 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=03+Zjh+wBWEKE/cApPVl+HIYOJjAjnbmEOy/YeRtPcM=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1704885360; v=1; b=oUr/5UOWve8cmUMWv1kSIc+iidvL7Ss0sdrRpYNYdspHZx4HPuOCMRoHzutGUhZnJMH1iEgR yDu1k+RYQlsVP+MNzqN3Igx3DxkIc7ng7zAgolR5CNLCDDXxjnXrbKAw0MWrmMqQswMMIMFa+v4 k2ApaSK8UjR3shU7glGYZ5SQ= X-Received: by 127.0.0.2 with SMTP id cxLJYY1788612xRGsEL9LT6u; Wed, 10 Jan 2024 03:16:00 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by mx.groups.io with SMTP id smtpd.web11.9422.1704885359336934057 for ; Wed, 10 Jan 2024 03:15:59 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10947"; a="11969133" X-IronPort-AV: E=Sophos;i="6.04,184,1695711600"; d="scan'208";a="11969133" X-Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jan 2024 03:15:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.04,184,1695711600"; d="scan'208";a="23912507" X-Received: from shwdejointd777.ccr.corp.intel.com ([10.239.58.116]) by orviesa002.jf.intel.com with ESMTP; 10 Jan 2024 03:15:54 -0800 From: "Wenxing Hou" To: devel@edk2.groups.io Cc: Jiewen Yao , Yi Li , Guomin Jiang Subject: [edk2-devel] [PATCH] CryptoPkg: change the define Date: Wed, 10 Jan 2024 19:15:51 +0800 Message-Id: <20240110111551.3706-1-wenxing.hou@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,wenxing.hou@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: d1yAoGUieKOENiPO2b2RPIamx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1704885362606100003 Content-Type: text/plain; charset="utf-8" REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D4632 Move the define to stdint and add MACRO to prevent duplicate inclusion. Cc: Jiewen Yao Cc: Yi Li Cc: Guomin Jiang Signed-off-by: Wenxing Hou --- 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 =3D time(NULL); (tvp)->= tv_usec =3D 0; } while (0) =20 -// -// 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 =20 **/ =20 +#ifndef CRYPTO_CRT_STDIO_H_ +#define CRYPTO_CRT_STDIO_H_ #include + +// +// 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 --=20 2.26.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#113524): https://edk2.groups.io/g/devel/message/113524 Mute This Topic: https://groups.io/mt/103638765/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-