From 2b578de0b213ecc98d5889ec496d12a56eb3b187 Mon Sep 17 00:00:00 2001
From: jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 12 Apr 2011 03:18:38 +0000
Subject: ShellPkg: Fix GCC 4.4 build issues

This change fixes various GCC 4.4 build issues
* EFIAPI usage inconsistencies
* multi-character literal warning ('eell')
* Filename case inconsistencies
* Use 'ULL' suffix for integers > 4GB

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11519 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../UefiShellDebug1CommandsLib/Edit/MainTextEditor.c   | 18 ------------------
 .../UefiShellDebug1CommandsLib/Edit/TextEditorTypes.h  |  2 +-
 2 files changed, 1 insertion(+), 19 deletions(-)

(limited to 'ShellPkg/Library/UefiShellDebug1CommandsLib/Edit')

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.c
index 713332ea0d..1a8f39a229 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.c
@@ -24,7 +24,6 @@
   @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
 **/
 EFI_STATUS
-EFIAPI
 MainCommandOpenFile (
   VOID
   );
@@ -35,7 +34,6 @@ MainCommandOpenFile (
   @retval EFI_SUCCESS           The switch was ok or a warning was presented.
 **/
 EFI_STATUS
-EFIAPI
 MainCommandSwitchFileType (
   VOID
   );
@@ -46,7 +44,6 @@ MainCommandSwitchFileType (
   @retval EFI_SUCCESS             The operation was successful.
 **/
 EFI_STATUS
-EFIAPI
 MainCommandGotoLine (
   VOID
   );
@@ -60,7 +57,6 @@ MainCommandGotoLine (
   @retval EFI_LOAD_ERROR          A file access error occured.
 **/
 EFI_STATUS
-EFIAPI
 MainCommandSaveFile (
   VOID
   );
@@ -73,7 +69,6 @@ MainCommandSaveFile (
   @retval EFI_LOAD_ERROR          A load error occured.
 **/
 EFI_STATUS
-EFIAPI
 MainCommandExit (
   VOID
   );
@@ -86,7 +81,6 @@ MainCommandExit (
   @retval EFI_LOAD_ERROR          A load error occured.
 **/
 EFI_STATUS
-EFIAPI
 MainCommandSearch (
   VOID
   );
@@ -99,7 +93,6 @@ MainCommandSearch (
   @retval EFI_LOAD_ERROR          A load error occured.
 **/
 EFI_STATUS
-EFIAPI
 MainCommandSearchReplace (
   VOID
   );
@@ -112,7 +105,6 @@ MainCommandSearchReplace (
   @retval EFI_LOAD_ERROR          A load error occured.
 **/
 EFI_STATUS
-EFIAPI
 MainCommandCutLine (
   VOID
   );
@@ -125,7 +117,6 @@ MainCommandCutLine (
   @retval EFI_LOAD_ERROR          A load error occured.
 **/
 EFI_STATUS
-EFIAPI
 MainCommandPasteLine (
   VOID
   );
@@ -195,7 +186,6 @@ EDITOR_MENU_ITEM  MainMenuItems[] = {
   @retval EFI_OUT_OF_RESOURCES    A memory allocation failed.
 **/
 EFI_STATUS
-EFIAPI
 MainCommandOpenFile (
   VOID
   )
@@ -350,7 +340,6 @@ MainCommandOpenFile (
   @retval EFI_SUCCESS           The switch was ok or a warning was presented.
 **/
 EFI_STATUS
-EFIAPI
 MainCommandSwitchFileType (
   VOID
   )
@@ -384,7 +373,6 @@ MainCommandSwitchFileType (
   @retval EFI_LOAD_ERROR          A load error occured.
 **/
 EFI_STATUS
-EFIAPI
 MainCommandCutLine (
   VOID
   )
@@ -422,7 +410,6 @@ MainCommandCutLine (
   @retval EFI_LOAD_ERROR          A load error occured.
 **/
 EFI_STATUS
-EFIAPI
 MainCommandPasteLine (
   VOID
   )
@@ -455,7 +442,6 @@ MainCommandPasteLine (
   @retval EFI_LOAD_ERROR          A load error occured.
 **/
 EFI_STATUS
-EFIAPI
 MainCommandSearch (
   VOID
   )
@@ -597,7 +583,6 @@ MainCommandSearch (
   @retval EFI_LOAD_ERROR          A load error occured.
 **/
 EFI_STATUS
-EFIAPI
 MainCommandSearchReplace (
   VOID
   )
@@ -901,7 +886,6 @@ MainCommandSearchReplace (
   @retval EFI_LOAD_ERROR          A load error occured.
 **/
 EFI_STATUS
-EFIAPI
 MainCommandExit (
   VOID
   )
@@ -983,7 +967,6 @@ MainCommandExit (
   @retval EFI_SUCCESS             The operation was successful.
 **/
 EFI_STATUS
-EFIAPI
 MainCommandGotoLine (
   VOID
   )
@@ -1057,7 +1040,6 @@ MainCommandGotoLine (
   @retval EFI_LOAD_ERROR          A file access error occured.
 **/
 EFI_STATUS
-EFIAPI
 MainCommandSaveFile (
   VOID
   )
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/TextEditorTypes.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/TextEditorTypes.h
index 9bcf39e028..dfd56dd9a6 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/TextEditorTypes.h
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/TextEditorTypes.h
@@ -42,7 +42,7 @@ typedef enum {
   NewLineTypeUnknown
 } EE_NEWLINE_TYPE;
 
-#define LINE_LIST_SIGNATURE  'eell'
+#define LINE_LIST_SIGNATURE  SIGNATURE_32 ('e', 'e', 'l', 'l')
 typedef struct _EFI_EDITOR_LINE {
   UINTN           Signature;
   CHAR16          *Buffer;
-- 
cgit v1.2.3