EADK (StdLib, AppPkg, StdLibPrivateInternalFiles): Python Beta Release.

[mirror_edk2.git] / StdLib / Include / sys / EfiCdefs.h

diff --git a/StdLib/Include/sys/EfiCdefs.h b/StdLib/Include/sys/EfiCdefs.h
index 812a495d95a28f2dbc5c043d99f0818fe4223f56..be114ddbe487014b8a81863c01e4cfb41b5b8d88 100644 (file)
--- a/StdLib/Include/sys/EfiCdefs.h
+++ b/StdLib/Include/sys/EfiCdefs.h
@@ -22,7 +22,7 @@
     This file and its contents are inspired by the <sys/cdefs.h> files in Berkeley\r
     Unix.  They have been re-implemented to be specific to the EFI environment.\r
 \r
-    Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>\r
+    Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>\r
     This program and the accompanying materials are licensed and made available under\r
     the terms and conditions of the BSD License that accompanies this distribution.\r
     The full text of the license may be found at\r
@@ -330,6 +330,10 @@
   #error You must specify /Zc:wchar_t- to the compiler to turn off intrinsic wchar_t.\r
   #endif\r
 \r
+  /* Get rid of pre-defined macros that are misleading in this environment. */\r
+  #undef  _WIN32\r
+  #undef  _WIN64\r
+\r
   // Keep compiler quiet about casting from smaller to larger types\r
   #pragma warning ( disable : 4306 )\r
 #endif  /* defined(_MSC_VER) */\r
@@ -344,8 +348,8 @@ typedef UINT32  ULONG32;
 typedef  INT64   LONG64;\r
 typedef UINT64  ULONG64;\r
 \r
-typedef   INT32   EFI_LONG_T;\r
-typedef  UINT32   EFI_ULONG_T;\r
+typedef   INTN   EFI_LONG_T;\r
+typedef  UINTN   EFI_ULONG_T;\r
 \r
 /* These types reflect the compiler's size for long */\r
 #if defined(__GNUC__)\r