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

7 files changed, 17 insertions, 17 deletions

diff --git a/ShellPkg/Application/ShellExecTestApp/SA.C b/ShellPkg/Application/ShellExecTestApp/SA.c
index 7db28f64cb..7db28f64cb 100644
--- a/ShellPkg/Application/ShellExecTestApp/SA.C
+++ b/ShellPkg/Application/ShellExecTestApp/SA.c
diff --git a/ShellPkg/Application/ShellExecTestApp/SA.inf b/ShellPkg/Application/ShellExecTestApp/SA.inf
index 0384eaa712..b2d19a2826 100644
--- a/ShellPkg/Application/ShellExecTestApp/SA.inf
+++ b/ShellPkg/Application/ShellExecTestApp/SA.inf
@@ -30,7 +30,7 @@
 #

 

 [Sources]

-  SA.C

+  SA.c

 

 [Packages]

   MdePkg/MdePkg.dec

diff --git a/ShellPkg/Include/Library/ShellLib.h b/ShellPkg/Include/Library/ShellLib.h
index ad3cc01f42..1a9ef5ac59 100644
--- a/ShellPkg/Include/Library/ShellLib.h
+++ b/ShellPkg/Include/Library/ShellLib.h
@@ -245,7 +245,7 @@ EFIAPI
 ShellWriteFile(

   IN EFI_FILE_HANDLE            FileHandle,

   IN OUT UINTN                  *BufferSize,

-  IN CONST VOID                 *Buffer

+  IN VOID                       *Buffer

   );

 

 /** 

diff --git a/ShellPkg/Include/Protocol/EfiShell.h b/ShellPkg/Include/Protocol/EfiShell.h
index d19f3b005f..67306bbb76 100644
--- a/ShellPkg/Include/Protocol/EfiShell.h
+++ b/ShellPkg/Include/Protocol/EfiShell.h
@@ -902,9 +902,9 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (EFIAPI *EFI_SHELL_WRITE_FILE)(

-  IN EFI_FILE_HANDLE FileHandle,

-  IN OUT UINTN *BufferSize,

-  OUT VOID *Buffer

+  IN EFI_FILE_HANDLE            FileHandle,

+  IN OUT UINTN                  *BufferSize,

+  IN VOID                       *Buffer

   );

 

 typedef struct _EFI_SHELL_PROTOCOL {

diff --git a/ShellPkg/Include/Protocol/EfiShellEnvironment2.h b/ShellPkg/Include/Protocol/EfiShellEnvironment2.h
index cafecb0cf3..7dbe715afb 100644
--- 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_

 #define _SHELLENV2_H_

 

-#include <Protocol\SimpleTextIn.h>

-#include <Protocol\SimpleTextOut.h>

-#include <Protocol\EfiShellInterface.h>

+#include <Protocol/SimpleTextIn.h>

+#include <Protocol/SimpleTextOut.h>

+#include <Protocol/EfiShellInterface.h>

 

 #define DEFAULT_INIT_ROW    1

 #define DEFAULT_AUTO_LF     FALSE

diff --git a/ShellPkg/Include/Protocol/EfiShellInterface.h b/ShellPkg/Include/Protocol/EfiShellInterface.h
index bc15b4bca7..3b72543007 100644
--- a/ShellPkg/Include/Protocol/EfiShellInterface.h
+++ b/ShellPkg/Include/Protocol/EfiShellInterface.h
@@ -26,7 +26,7 @@
 #ifndef _SHELLINTERFACE_H_

 #define _SHELLINTERFACE_H_

 

-#include <Protocol\LoadedImage.h>

+#include <Protocol/LoadedImage.h>

 

 #define SHELL_INTERFACE_PROTOCOL_GUID \

   { \

@@ -38,11 +38,11 @@
 ///

 typedef enum {

   ARG_NO_ATTRIB         = 0x0,

-  ARG_IS_QUOTED         = 0x1,

-  ARG_PARTIALLY_QUOTED  = 0x2,

-  ARG_FIRST_HALF_QUOTED = 0x4,

-  ARG_FIRST_CHAR_IS_ESC = 0x8

-};

+  ARG_IS_QUOTED         = BIT0,

+  ARG_PARTIALLY_QUOTED  = BIT1,

+  ARG_FIRST_HALF_QUOTED = BIT2,

+  ARG_FIRST_CHAR_IS_ESC = BIT3

+} EFI_SHELL_ARG_INFO_TYPES;

 

 ///

 /// attributes for an argument.

diff --git a/ShellPkg/Library/BaseShellLib/BaseShellLib.c b/ShellPkg/Library/BaseShellLib/BaseShellLib.c
index acc6dffb82..1ddff9a2a0 100644
--- a/ShellPkg/Library/BaseShellLib/BaseShellLib.c
+++ b/ShellPkg/Library/BaseShellLib/BaseShellLib.c
@@ -455,7 +455,7 @@ ShellOpenFileByDevicePath(
   }

   Status = gBS->OpenProtocol(*DeviceHandle,

                              &gEfiSimpleFileSystemProtocolGuid,

-                             &EfiSimpleFileSystemProtocol,

+                             (VOID**) &EfiSimpleFileSystemProtocol,

                              gImageHandle,

                              NULL,

                              EFI_OPEN_PROTOCOL_GET_PROTOCOL);

@@ -1725,7 +1725,7 @@ ShellCommandLineParse (
                                      CheckPackage, 

                                      ProblemParam, 

                                      AutoPageBreak, 

-                                     mEfiShellParametersProtocol->Argv,

+                                     (CONST CHAR16**) mEfiShellParametersProtocol->Argv,

                                      mEfiShellParametersProtocol->Argc ));

   }

 

@@ -1737,7 +1737,7 @@ ShellCommandLineParse (
                                    CheckPackage, 

                                    ProblemParam, 

                                    AutoPageBreak, 

-                                   mEfiShellInterface->Argv,

+                                   (CONST CHAR16**) mEfiShellInterface->Argv,

                                    mEfiShellInterface->Argc ));

 }