From nobody Fri May 17 03:00:53 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+113526+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+113526+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1704886542; cv=none; d=zohomail.com; s=zohoarc; b=WsgcMY6N9pfsKnnI3T4jnxNNKAyt1Q9qYi8bZg2ixGID3N0JUfKL6uCrOpD4QHSL4Hk/AcpaK849GJfDT/aMQEVtCfgnc8JKcW7K/MOiM6Fe1OPS2Y430STQoDyjmRre2cSLFgMro7gUJ2tqN5tMgSORdCLbjbSdLqyvM+pkFPk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1704886542; 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=C4pqGaYfCkOvl8csq71stv1pA+CmUZY/8s3MazPKNRk=; b=YPiDRZmXTZ8yJrKHUF3JBoaP2ccfxWs8funMLdmgLH2bOF11i1uPO5yIgGTFd/IAXth4zCFuMmEuvR9vnLdPDIC0jsZJ2Hl/AU27B6WXk8lyrjElFHRTj7haKJNAnh8AXJ5ReAlfQNnvwzFO+syfcTV0n0SoFZ9iMel4E5gpRYI= 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+113526+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 1704886542077919.0748745847642; Wed, 10 Jan 2024 03:35:42 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=MJenGDqK1PfBfDsB4yEyGVauZU30FKg65tAOeHbtlBk=; 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=1704886541; v=1; b=Y49ac+XIovF/UzEL00Bz01HW4/xhHr550lUy5MQS+ypoq3qoYJaZ542YSkvTKDhIDXgAXPB8 esY/7eorqhf0um6KMkS7t6BPv54wWVb+JfWsrGozdWTzmOGLOLC7b0HIliM4CtQ/DmKTXLlXroz nJH667cKG6TtI+1YE63IElIc= X-Received: by 127.0.0.2 with SMTP id iEObYY1788612x9dBc2fbItY; Wed, 10 Jan 2024 03:35:41 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by mx.groups.io with SMTP id smtpd.web11.9670.1704886541122024174 for ; Wed, 10 Jan 2024 03:35:41 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10948"; a="19984683" X-IronPort-AV: E=Sophos;i="6.04,184,1695711600"; d="scan'208";a="19984683" X-Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jan 2024 03:35:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10948"; a="955344949" X-IronPort-AV: E=Sophos;i="6.04,184,1695711600"; d="scan'208";a="955344949" X-Received: from shwdejointd777.ccr.corp.intel.com ([10.239.58.116]) by orsmga005.jf.intel.com with ESMTP; 10 Jan 2024 03:35:38 -0800 From: "Wenxing Hou" To: devel@edk2.groups.io Cc: Jiewen Yao , Yi Li , Guomin Jiang Subject: [edk2-devel] [PATCH v2] CryptoPkg: Fix redefinition error of int defines Date: Wed, 10 Jan 2024 19:35:33 +0800 Message-Id: <20240110113533.3792-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: NJYd0oOkDlyEhdcF7JpUq28hx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1704886543895100003 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 Reviewed-by: Yi Li --- 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 (#113526): https://edk2.groups.io/g/devel/message/113526 Mute This Topic: https://groups.io/mt/103638905/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-