From: Song, BinX Date: Thu, 3 Nov 2016 02:33:20 +0000 (+0800) Subject: MdePkg/BaseLib: Move CHAR_NULL definition to Base.h in BaseLib X-Git-Tag: edk2-stable201903~5362 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=0c45a5b288437f62b93c046b4cc8827919a79fd1 MdePkg/BaseLib: Move CHAR_NULL definition to Base.h in BaseLib - Required unicode control chars -> Null character - Remove CHAR_NULL definition in SimpleTextIn.h - https://bugzilla.tianocore.org/show_bug.cgi?id=172 Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Bell Song Reviewed-by: Liming Gao --- diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h index 22170581a0..5e24b5d487 100644 --- a/MdePkg/Include/Base.h +++ b/MdePkg/Include/Base.h @@ -338,6 +338,11 @@ struct _LIST_ENTRY { /// #define NULL ((VOID *) 0) +// +// Null character +// +#define CHAR_NULL 0x0000 + /// /// Maximum values for common UEFI Data Types /// diff --git a/MdePkg/Include/Protocol/SimpleTextIn.h b/MdePkg/Include/Protocol/SimpleTextIn.h index 71dcb0bd13..ebe1c7e0cd 100644 --- a/MdePkg/Include/Protocol/SimpleTextIn.h +++ b/MdePkg/Include/Protocol/SimpleTextIn.h @@ -46,7 +46,6 @@ typedef struct { // // Required unicode control chars // -#define CHAR_NULL 0x0000 #define CHAR_BACKSPACE 0x0008 #define CHAR_TAB 0x0009 #define CHAR_LINEFEED 0x000A diff --git a/MdePkg/Library/BaseLib/FilePaths.c b/MdePkg/Library/BaseLib/FilePaths.c index c8da6bb3ea..183b3234d3 100644 --- a/MdePkg/Library/BaseLib/FilePaths.c +++ b/MdePkg/Library/BaseLib/FilePaths.c @@ -10,10 +10,8 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ -#include #include #include -#include /** Removes the last directory or file entry in a path by changing the last