diff options
| author | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-04-12 03:18:38 +0000 |
|---|---|---|
| committer | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-04-12 03:18:38 +0000 |
| commit | 2b578de0b213ecc98d5889ec496d12a56eb3b187 (patch) | |
| tree | c6663816a5bbb5a6259beeb54b66e18049934f1d /ShellPkg/Library/UefiShellDebug1CommandsLib/Edit | |
| parent | 4a22b9bc6a5a5cc5e7f868f8ab3ee28cd770c545 (diff) | |
| download | edk2-2b578de0b213ecc98d5889ec496d12a56eb3b187.zip edk2-2b578de0b213ecc98d5889ec496d12a56eb3b187.tar.gz edk2-2b578de0b213ecc98d5889ec496d12a56eb3b187.tar.bz2 | |
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
Diffstat (limited to 'ShellPkg/Library/UefiShellDebug1CommandsLib/Edit')
| -rw-r--r-- | ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.c | 18 | ||||
| -rw-r--r-- | ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/TextEditorTypes.h | 2 |
2 files changed, 1 insertions, 19 deletions
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.c index 713332e..1a8f39a 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 9bcf39e..dfd56dd 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;
|