Fix GCC build errors.

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

5 files changed, 21 insertions, 11 deletions

diff --git a/StdLib/Include/Ia32/machine/limits.h b/StdLib/Include/Ia32/machine/limits.h
index f072e54a7d..cc42e0f4c0 100644
--- a/StdLib/Include/Ia32/machine/limits.h
+++ b/StdLib/Include/Ia32/machine/limits.h
@@ -26,8 +26,8 @@
 #define __LONG_MIN    (-2147483647L - 1L)   // -(2^31 - 1)

 

 /** Maximum value for an object of type long int. **/

-#define __LONG_MAX    +2147483647L          // 2^31 - 1

+#define __LONG_MAX     2147483647L          // 2^31 - 1

 

 /** Maximum value for an object of type unsigned long int. **/

-#define __ULONG_MAX   0xffffffff            // 2^32 - 1

+#define __ULONG_MAX   0xffffffffUL          // 2^32 - 1

 

diff --git a/StdLib/Include/X64/machine/limits.h b/StdLib/Include/X64/machine/limits.h
index d046c64dab..144549cc7f 100644
--- a/StdLib/Include/X64/machine/limits.h
+++ b/StdLib/Include/X64/machine/limits.h
@@ -5,13 +5,13 @@
 #if defined(__GNUC__)

 #define __LONG_BIT      64

 /** minimum value for an object of type long int **/

-#define __LONG_MIN    (-9223372036854775807L - 1L) // -(2^63 - 1)

+#define __LONG_MIN    (-9223372036854775807LL - 1LL) // -(2^63 - 1)

 

 /** maximum value for an object of type long int **/

-#define __LONG_MAX    +9223372036854775807L // 2^63 - 1

+#define __LONG_MAX    +9223372036854775807LL // 2^63 - 1

 

 /** maximum value for an object of type unsigned long int **/

-#define __ULONG_MAX   0xFFFFFFFFFFFFFFFFUL // 2^64 - 1

+#define __ULONG_MAX   0xFFFFFFFFFFFFFFFFULL // 2^64 - 1

 #else

 #define __LONG_BIT      32

 /** minimum value for an object of type long int **/

diff --git a/StdLib/LibC/Stdio/Stdio.inf b/StdLib/LibC/Stdio/Stdio.inf
index 6edc8867e8..1b8852e0b5 100644
--- a/StdLib/LibC/Stdio/Stdio.inf
+++ b/StdLib/LibC/Stdio/Stdio.inf
@@ -143,4 +143,4 @@
 # Nasty things could happen if you do.

 #

 [BuildOptions]

-  GCC:*_*_*_CC_FLAGS    = -fno-builtin -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast

+  GCC:*_*_*_CC_FLAGS    = -fno-builtin -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast -Wno-format

diff --git a/StdLib/PosixLib/Glob/LibGlob.inf b/StdLib/PosixLib/Glob/LibGlob.inf
index fab4730bb8..06404382b7 100644
--- a/StdLib/PosixLib/Glob/LibGlob.inf
+++ b/StdLib/PosixLib/Glob/LibGlob.inf
@@ -23,7 +23,7 @@
 

 

 #

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

+#  VALID_ARCHITECTURES           = IA32 X64 IPF

 #

 

 [Sources.common]

@@ -40,8 +40,7 @@
   MemoryAllocationLib

   ShellLib

   BaseLib

+  LibC

   LibStdio

   LibStdLib

   LibString

-

-[Pcd]

diff --git a/StdLib/PosixLib/Glob/glob.c b/StdLib/PosixLib/Glob/glob.c
index dec78d89d6..a6a2dc156e 100644
--- a/StdLib/PosixLib/Glob/glob.c
+++ b/StdLib/PosixLib/Glob/glob.c
@@ -23,6 +23,15 @@
  * gl_matchc:

  *  Number of matches in the current invocation of glob.

  *

+    Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>

+    This program and the accompanying materials are licensed and made available under

+    the terms and conditions of the BSD License that accompanies this distribution.

+    The full text of the license may be found at

+    http://opensource.org/licenses/bsd-license.

+

+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+

  * Copyright (c) 1989, 1993

  *  The Regents of the University of California.  All rights reserved.

  *

@@ -56,8 +65,10 @@
     glob.c  8.3 (Berkeley) 10/13/93

     NetBSD: glob.c,v 1.23.4.1 2010/07/19 18:14:08 riz Exp

  */

-#pragma warning ( disable : 4244 )

-#pragma warning ( disable : 4018 )

+#if defined(_MSC_VER)

+  #pragma warning ( disable : 4244 )

+  #pragma warning ( disable : 4018 )

+#endif

 

 #include  <LibConfig.h>