From nobody Fri May 17 02:03:05 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+113148+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+113148+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1704356421; cv=none; d=zohomail.com; s=zohoarc; b=mrRJbMKsNoADIO/bQ7sHbDzWpHVr3ILyVgMmH8ZQ813JbLUlBdJCpiMeYKJ4MCwP/Nu9zFen030uTat6doGTyGBz7OJumnedei37cVwLrhNGL/iYKXXbY7BjZoPScU+pt609h9bHUAvzZz2TuVkupoqcw6niPLiD6enSllbBECw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1704356421; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=rfoio6h2S3m29XH/SggYY08hJ+SmlcvoWuWhEhJoPMo=; b=idyXwcuIphgrID4/PB3xvJx4hdiUNqyhPEMgza223CQ5HIaFuYJistYie6QXetgy86AooT+EXlNL6Y+3UhFkz0R8r4J+I2uac3dX8ipc417NS2Eg7Rni8nG30SsEhHF8IA7gv10r2cX0f3nKAueuQbP2FZGdZu6dNcsZ4EPKwdE= 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+113148+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 1704356421217643.4863653846307; Thu, 4 Jan 2024 00:20:21 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=MxyNz+lynq/nzvQRv58XUVJHqSU/DYw+LVBD6gMSUCw=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: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=1704356420; v=1; b=u2f5O7cdKxJsrxaNr+lchhfMX0CFIWeDLge9VVeEmOScPPOzAu1a4A397jTiTSwQ1laTE1dz uiR/S+bqXF6+zaIUFXPyy36cPCRH6NQRyyKVrU44ra2qpbd7BMhCXpfso++KhSQksp28CIRsFGn 7iizkGd/NLMqvKOH63J27o1g= X-Received: by 127.0.0.2 with SMTP id kTUdYY1788612xkCYBHLr0ay; Thu, 04 Jan 2024 00:20:20 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by mx.groups.io with SMTP id smtpd.web10.49900.1704356418896155025 for ; Thu, 04 Jan 2024 00:20:19 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10942"; a="3933610" X-IronPort-AV: E=Sophos;i="6.04,330,1695711600"; d="scan'208";a="3933610" X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jan 2024 00:20:04 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10942"; a="814546301" X-IronPort-AV: E=Sophos;i="6.04,330,1695711600"; d="scan'208";a="814546301" X-Received: from shwdejointd777.ccr.corp.intel.com ([10.239.58.116]) by orsmga001.jf.intel.com with ESMTP; 04 Jan 2024 00:20:01 -0800 From: "Wenxing Hou" To: devel@edk2.groups.io Cc: Jiewen Yao , Yi Li , Guomin Jiang Subject: [edk2-devel] [PATCH 1/1] CryptoPkg: move define to CrtLibSupport Date: Thu, 4 Jan 2024 16:19:55 +0800 Message-Id: <20240104081955.2848-2-wenxing.hou@intel.com> In-Reply-To: <20240104081955.2848-1-wenxing.hou@intel.com> References: <20240104081955.2848-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: vtwZMVDo6xvymtjLSlAqOwIOx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1704356421552100004 Content-Type: text/plain; charset="utf-8" REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D4632 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 --- 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 =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 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 **/ =20 #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; --=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 (#113148): https://edk2.groups.io/g/devel/message/113148 Mute This Topic: https://groups.io/mt/103519077/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-