MdeModulePkg: Unify the definitions of size_t

[edk2-devel] [PATCH] MdeModulePkg: Unify the definitions of size_t

Posted by Zhiguang Liu 4 years, 5 months ago

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2338

Cc: Jian J Wang <jian.j.wang@intel.com>

Cc: Hao A Wu <hao.a.wu@intel.com>

Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
---
 MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/types.h | 6 +-----
 MdeModulePkg/Library/LzmaCustomDecompressLib/UefiLzma.h       | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/types.h b/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/types.h
index 2867d206f7..35c9569642 100644
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/types.h
+++ b/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/types.h
@@ -13,11 +13,7 @@
 #define BROTLI_COMMON_TYPES_H_
 
 //#include <stddef.h>  /* for size_t */
-#ifndef _SIZE_T_DEFINED
-#if !defined(_WIN64) || defined(__GNUC__)
-typedef unsigned int size_t;
-#endif
-#endif
+typedef UINTN size_t;
 
 #if defined(_MSC_VER) && (_MSC_VER < 1600)
 typedef __int8 int8_t;
diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/UefiLzma.h b/MdeModulePkg/Library/LzmaCustomDecompressLib/UefiLzma.h
index cbdecd377b..e1315b6ec3 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/UefiLzma.h
+++ b/MdeModulePkg/Library/LzmaCustomDecompressLib/UefiLzma.h
@@ -18,11 +18,7 @@
 #undef _WIN32
 #endif
 
-#ifndef _SIZE_T_DEFINED
-#if !defined(_WIN64) || defined(__GNUC__)
-typedef unsigned int size_t;
-#endif
-#endif
+typedef UINTN size_t;
 
 #ifdef _WIN64
 #undef _WIN64
-- 
2.16.2.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#50452): https://edk2.groups.io/g/devel/message/50452
Mute This Topic: https://groups.io/mt/54164407/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] MdeModulePkg: Unify the definitions of size_t

Posted by Liming Gao 4 years, 5 months ago

Reviewed-by: Liming Gao <liming.gao@intel.com>

>-----Original Message-----
>From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
>Zhiguang Liu
>Sent: Tuesday, November 12, 2019 4:48 PM
>To: devel@edk2.groups.io
>Cc: Wang, Jian J <jian.j.wang@intel.com>; Wu, Hao A <hao.a.wu@intel.com>
>Subject: [edk2-devel] [PATCH] MdeModulePkg: Unify the definitions of size_t
>
>REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2338
>
>Cc: Jian J Wang <jian.j.wang@intel.com>
>
>Cc: Hao A Wu <hao.a.wu@intel.com>
>
>Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
>---
> MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/types.h | 6 +-----
> MdeModulePkg/Library/LzmaCustomDecompressLib/UefiLzma.h       | 6 +-----
> 2 files changed, 2 insertions(+), 10 deletions(-)
>
>diff --git
>a/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/types.h
>b/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/types.h
>index 2867d206f7..35c9569642 100644
>--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/types.h
>+++ b/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/types.h
>@@ -13,11 +13,7 @@
> #define BROTLI_COMMON_TYPES_H_
>
> //#include <stddef.h>  /* for size_t */
>-#ifndef _SIZE_T_DEFINED
>-#if !defined(_WIN64) || defined(__GNUC__)
>-typedef unsigned int size_t;
>-#endif
>-#endif
>+typedef UINTN size_t;
>
> #if defined(_MSC_VER) && (_MSC_VER < 1600)
> typedef __int8 int8_t;
>diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/UefiLzma.h
>b/MdeModulePkg/Library/LzmaCustomDecompressLib/UefiLzma.h
>index cbdecd377b..e1315b6ec3 100644
>--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/UefiLzma.h
>+++ b/MdeModulePkg/Library/LzmaCustomDecompressLib/UefiLzma.h
>@@ -18,11 +18,7 @@
> #undef _WIN32
> #endif
>
>-#ifndef _SIZE_T_DEFINED
>-#if !defined(_WIN64) || defined(__GNUC__)
>-typedef unsigned int size_t;
>-#endif
>-#endif
>+typedef UINTN size_t;
>
> #ifdef _WIN64
> #undef _WIN64
>--
>2.16.2.windows.1
>
>
>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#50601): https://edk2.groups.io/g/devel/message/50601
Mute This Topic: https://groups.io/mt/54164407/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-