From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id AEA0DAC0B7B for ; Thu, 4 Jan 2024 08:20:21 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=jW5gU8F55WbdnmSLBtWAXjlVg/VG6qd8br2YHt0XzZ0=; 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=GMLs9Fl3OIfvtcVS+R0DmTPSl1AS2gfOsYtCEKUtZalK4Ld619I48I0VP5Kxs0Xrer39RWhK JR7MhmjcXPHlFNzX0fQbiB7+WODdO71UqhvNociP/9XLyG3MON4IAuZY9M+i0G5BKH35HnEWN2Z nMyp77GRy9Z4dhtRPkfZxjRo= X-Received: by 127.0.0.2 with SMTP id WuIRYY7687511xLHCwZwMlRH; 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: zCJQvCGB1llZ763APoMKUKxox7686176AA= Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=GMLs9Fl3; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io 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)=0D #define gettimeofday(tvp, tz) do { (tvp)->tv_sec =3D time(NULL); (tvp)->= tv_usec =3D 0; } while (0)=0D =0D +//=0D +// only use in Mbedlts. The Openssl has defined them internally.=0D +//=0D +#ifndef OPENSSL_SYS_UEFI=0D +typedef INT8 int8_t;=0D +typedef UINT8 uint8_t;=0D +typedef INT16 int16_t;=0D +typedef UINT16 uint16_t;=0D +typedef INT32 int32_t;=0D +typedef UINT32 uint32_t;=0D +typedef INT64 int64_t;=0D +typedef UINT64 uint64_t;=0D +typedef UINTN uintptr_t;=0D +#endif=0D +=0D #endif=0D 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 **/=0D =0D #include =0D -=0D -typedef INT8 int8_t;=0D -typedef UINT8 uint8_t;=0D -typedef INT16 int16_t;=0D -typedef UINT16 uint16_t;=0D -typedef INT32 int32_t;=0D -typedef UINT32 uint32_t;=0D -typedef INT64 int64_t;=0D -typedef UINT64 uint64_t;=0D -typedef UINTN uintptr_t;=0D --=20 2.26.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- 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/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-