Fix ShellPkg build errors for UNIXGCC toolchain.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8555 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ShellPkg/Application/ShellExecTestApp/SA.C b/ShellPkg/Application/ShellExecTestApp/SA.C
deleted file mode 100644 (file)
index 7db28f6..0000000
--- a/ShellPkg/Application/ShellExecTestApp/SA.C
+++ /dev/null
@@ -1,38 +0,0 @@
-/** @file\r
-  This is a simple shell application\r
-\r
-  Copyright (c) 2008, Intel Corporation                                                         \r
-  All rights reserved. This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
-\r
-**/\r
-\r
-#include <Uefi.h>\r
-#include <Library/UefiApplicationEntryPoint.h>\r
-#include <Library/UefiLib.h>\r
-\r
-/**\r
-  as the real entry point for the application.\r
-\r
-  @param[in] ImageHandle    The firmware allocated handle for the EFI image.  \r
-  @param[in] SystemTable    A pointer to the EFI System Table.\r
-  \r
-  @retval EFI_SUCCESS       The entry point is executed successfully.\r
-  @retval other             Some error occurs when executing this entry point.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-UefiMain (\r
-  IN EFI_HANDLE        ImageHandle,\r
-  IN EFI_SYSTEM_TABLE  *SystemTable\r
-  )\r
-{\r
-  Print(L"ShellExecute - Pass"); \r
-  return EFI_SUCCESS;\r
-}
\ No newline at end of file

diff --git a/ShellPkg/Application/ShellExecTestApp/SA.c b/ShellPkg/Application/ShellExecTestApp/SA.c
new file mode 100644 (file)
index 0000000..7db28f6
--- /dev/null
+++ b/ShellPkg/Application/ShellExecTestApp/SA.c
@@ -0,0 +1,38 @@
+/** @file\r
+  This is a simple shell application\r
+\r
+  Copyright (c) 2008, Intel Corporation                                                         \r
+  All rights reserved. This program and the accompanying materials                          \r
+  are licensed and made available under the terms and conditions of the BSD License         \r
+  which accompanies this distribution.  The full text of the license may be found at        \r
+  http://opensource.org/licenses/bsd-license.php                                            \r
+\r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+\r
+**/\r
+\r
+#include <Uefi.h>\r
+#include <Library/UefiApplicationEntryPoint.h>\r
+#include <Library/UefiLib.h>\r
+\r
+/**\r
+  as the real entry point for the application.\r
+\r
+  @param[in] ImageHandle    The firmware allocated handle for the EFI image.  \r
+  @param[in] SystemTable    A pointer to the EFI System Table.\r
+  \r
+  @retval EFI_SUCCESS       The entry point is executed successfully.\r
+  @retval other             Some error occurs when executing this entry point.\r
+\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+UefiMain (\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
+  )\r
+{\r
+  Print(L"ShellExecute - Pass"); \r
+  return EFI_SUCCESS;\r
+}
\ No newline at end of file

diff --git a/ShellPkg/Application/ShellExecTestApp/SA.inf b/ShellPkg/Application/ShellExecTestApp/SA.inf
index 0384eaa712ad6351858a3d9541e49acc045de49f..b2d19a2826488913f9d9c1ba27bad83d8cebbd4c 100644 (file)
--- a/ShellPkg/Application/ShellExecTestApp/SA.inf
+++ b/ShellPkg/Application/ShellExecTestApp/SA.inf
@@ -30,7 +30,7 @@
 #\r
 \r
 [Sources]\r
-  SA.C\r
+  SA.c\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r

diff --git a/ShellPkg/Include/Library/ShellLib.h b/ShellPkg/Include/Library/ShellLib.h
index ad3cc01f424d789d335e1272496f6725c75e79f1..1a9ef5ac59e96d10f4631ad18418e3242e0e84bc 100644 (file)
--- a/ShellPkg/Include/Library/ShellLib.h
+++ b/ShellPkg/Include/Library/ShellLib.h
@@ -245,7 +245,7 @@ EFIAPI
 ShellWriteFile(\r
   IN EFI_FILE_HANDLE            FileHandle,\r
   IN OUT UINTN                  *BufferSize,\r
-  IN CONST VOID                 *Buffer\r
+  IN VOID                       *Buffer\r
   );\r
 \r
 /** \r

diff --git a/ShellPkg/Include/Protocol/EfiShell.h b/ShellPkg/Include/Protocol/EfiShell.h
index d19f3b005faf24731374ef6d7041b1e783b9201b..67306bbb76de40226972bffe065bde44ad596600 100644 (file)
--- a/ShellPkg/Include/Protocol/EfiShell.h
+++ b/ShellPkg/Include/Protocol/EfiShell.h
@@ -902,9 +902,9 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_SHELL_WRITE_FILE)(\r
-  IN EFI_FILE_HANDLE FileHandle,\r
-  IN OUT UINTN *BufferSize,\r
-  OUT VOID *Buffer\r
+  IN EFI_FILE_HANDLE            FileHandle,\r
+  IN OUT UINTN                  *BufferSize,\r
+  IN VOID                       *Buffer\r
   );\r
 \r
 typedef struct _EFI_SHELL_PROTOCOL {\r

diff --git a/ShellPkg/Include/Protocol/EfiShellEnvironment2.h b/ShellPkg/Include/Protocol/EfiShellEnvironment2.h
index cafecb0cf346f5d1297def3bbdea0ce75e2d40f9..7dbe715afb11f4fd9294028b998af4919e063745 100644 (file)
--- a/ShellPkg/Include/Protocol/EfiShellEnvironment2.h
+++ b/ShellPkg/Include/Protocol/EfiShellEnvironment2.h
@@ -16,9 +16,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _SHELLENV2_H_\r
 #define _SHELLENV2_H_\r
 \r
-#include <Protocol\SimpleTextIn.h>\r
-#include <Protocol\SimpleTextOut.h>\r
-#include <Protocol\EfiShellInterface.h>\r
+#include <Protocol/SimpleTextIn.h>\r
+#include <Protocol/SimpleTextOut.h>\r
+#include <Protocol/EfiShellInterface.h>\r
 \r
 #define DEFAULT_INIT_ROW    1\r
 #define DEFAULT_AUTO_LF     FALSE\r

diff --git a/ShellPkg/Include/Protocol/EfiShellInterface.h b/ShellPkg/Include/Protocol/EfiShellInterface.h
index bc15b4bca792a132e8fbd2dbb21f89804d4531d5..3b72543007dcc3d74f4a9d4920198b3d237c6688 100644 (file)
--- a/ShellPkg/Include/Protocol/EfiShellInterface.h
+++ b/ShellPkg/Include/Protocol/EfiShellInterface.h
@@ -26,7 +26,7 @@
 #ifndef _SHELLINTERFACE_H_\r
 #define _SHELLINTERFACE_H_\r
 \r
-#include <Protocol\LoadedImage.h>\r
+#include <Protocol/LoadedImage.h>\r
 \r
 #define SHELL_INTERFACE_PROTOCOL_GUID \\r
   { \\r
@@ -38,11 +38,11 @@
 ///\r
 typedef enum {\r
   ARG_NO_ATTRIB         = 0x0,\r
-  ARG_IS_QUOTED         = 0x1,\r
-  ARG_PARTIALLY_QUOTED  = 0x2,\r
-  ARG_FIRST_HALF_QUOTED = 0x4,\r
-  ARG_FIRST_CHAR_IS_ESC = 0x8\r
-};\r
+  ARG_IS_QUOTED         = BIT0,\r
+  ARG_PARTIALLY_QUOTED  = BIT1,\r
+  ARG_FIRST_HALF_QUOTED = BIT2,\r
+  ARG_FIRST_CHAR_IS_ESC = BIT3\r
+} EFI_SHELL_ARG_INFO_TYPES;\r
 \r
 ///\r
 /// attributes for an argument.\r

diff --git a/ShellPkg/Library/BaseShellLib/BaseShellLib.c b/ShellPkg/Library/BaseShellLib/BaseShellLib.c
index acc6dffb82699e21cd100e995584ca883543f892..1ddff9a2a0130478a08370dc9cd05807f8b08abc 100644 (file)
--- a/ShellPkg/Library/BaseShellLib/BaseShellLib.c
+++ b/ShellPkg/Library/BaseShellLib/BaseShellLib.c
@@ -455,7 +455,7 @@ ShellOpenFileByDevicePath(
   }\r
   Status = gBS->OpenProtocol(*DeviceHandle,\r
                              &gEfiSimpleFileSystemProtocolGuid,\r
-                             &EfiSimpleFileSystemProtocol,\r
+                             (VOID**) &EfiSimpleFileSystemProtocol,\r
                              gImageHandle,\r
                              NULL,\r
                              EFI_OPEN_PROTOCOL_GET_PROTOCOL);\r
@@ -1725,7 +1725,7 @@ ShellCommandLineParse (
                                      CheckPackage, \r
                                      ProblemParam, \r
                                      AutoPageBreak, \r
-                                     mEfiShellParametersProtocol->Argv,\r
+                                     (CONST CHAR16**) mEfiShellParametersProtocol->Argv,\r
                                      mEfiShellParametersProtocol->Argc ));\r
   }\r
 \r
@@ -1737,7 +1737,7 @@ ShellCommandLineParse (
                                    CheckPackage, \r
                                    ProblemParam, \r
                                    AutoPageBreak, \r
-                                   mEfiShellInterface->Argv,\r
+                                   (CONST CHAR16**) mEfiShellInterface->Argv,\r
                                    mEfiShellInterface->Argc ));\r
 }\r
 \r