Updating processor bindings to not use stdint.h. Also added code to verify at compil...

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

diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h
index 2a55dd2697bae32d698f671d5e5ad4e394ac5dcb..98fdca36a6dbe577dd162c4edb24b7b94424a6da 100644 (file)
--- a/MdePkg/Include/Base.h
+++ b/MdePkg/Include/Base.h
@@ -27,6 +27,25 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //\r
 #include <ProcessorBind.h>\r
 \r
+//\r
+// Verify that ProcessorBind.h produced UEFI Data Types that are compliant with \r
+// Section 2.3.1 of the UEFI 2.3 Specification.  Generates a divide by zero \r
+// error or a zero size array declaration in the preprocessor if the size is \r
+// incorrect.  These are declared as "extern" so the space for these arrays will \r
+// not be in the modules.\r
+//\r
+extern UINT8 _VerifySizeOfBoolean [(sizeof(BOOLEAN) == 1) / (sizeof(BOOLEAN) == 1)];\r
+extern UINT8 _VerifySizeOfInt8    [(sizeof(INT8)    == 1) / (sizeof(INT8)    == 1)];\r
+extern UINT8 _VerifySizeOfUint8   [(sizeof(UINT8)   == 1) / (sizeof(UINT8)   == 1)];\r
+extern UINT8 _VerifySizeOfInt16   [(sizeof(INT16)   == 2) / (sizeof(INT16)   == 2)];\r
+extern UINT8 _VerifySizeOfUint16  [(sizeof(UINT16)  == 2) / (sizeof(UINT16)  == 2)];\r
+extern UINT8 _VerifySizeOfInt32   [(sizeof(INT32)   == 4) / (sizeof(INT32)   == 4)];\r
+extern UINT8 _VerifySizeOfUint32  [(sizeof(UINT32)  == 4) / (sizeof(UINT32)  == 4)];\r
+extern UINT8 _VerifySizeOfInt64   [(sizeof(INT64)   == 8) / (sizeof(INT64)   == 8)];\r
+extern UINT8 _VerifySizeOfUint64  [(sizeof(UINT64)  == 8) / (sizeof(UINT64)  == 8)];\r
+extern UINT8 _VerifySizeOfChar8   [(sizeof(CHAR8)   == 1) / (sizeof(CHAR8)   == 1)];\r
+extern UINT8 _VerifySizeOfChar16  [(sizeof(CHAR16)  == 2) / (sizeof(CHAR16)  == 2)];\r
+\r
 //\r
 // The Microsoft* C compiler can removed references to unreferenced data items\r
 //  if the /OPT:REF linker option is used. We defined a macro as this is a \r

diff --git a/MdePkg/Include/Ia32/ProcessorBind.h b/MdePkg/Include/Ia32/ProcessorBind.h
index 4e1d585a9c0481ff4f71a4b90bc75f4d700b0e55..0ffb2ee29ad8fa28938febc2975d44823e28d706 100644 (file)
--- a/MdePkg/Include/Ia32/ProcessorBind.h
+++ b/MdePkg/Include/Ia32/ProcessorBind.h
@@ -96,170 +96,105 @@
 #endif\r
 \r
 \r
-#if !defined(__GNUC__) && (__STDC_VERSION__ < 199901L)\r
-  //\r
-  // No ANSI C 2000 stdint.h integer width declarations, so define equivalents\r
-  //\r
- \r
-  #if defined(_MSC_EXTENSIONS)\r
-\r
-    //\r
-    // use Microsoft C complier dependent integer width types \r
-    //\r
-\r
-    ///\r
-    /// 8-byte unsigned value\r
-    ///\r
-    typedef unsigned __int64    UINT64;\r
-    ///\r
-    /// 8-byte signed value\r
-    ///\r
-    typedef __int64             INT64;\r
-    ///\r
-    /// 4-byte unsigned value\r
-    ///\r
-    typedef unsigned __int32    UINT32;\r
-    ///\r
-    /// 4-byte signed value\r
-    ///\r
-    typedef __int32             INT32;\r
-    ///\r
-    /// 2-byte unsigned value\r
-    ///\r
-    typedef unsigned short      UINT16;\r
-    ///\r
-    /// 2-byte Character.  Unless otherwise specified all strings are stored in the\r
-    /// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.\r
-    ///\r
-    typedef unsigned short      CHAR16;\r
-    ///\r
-    /// 2-byte signed value\r
-    ///\r
-    typedef short               INT16;\r
-    ///\r
-    /// Logical Boolean.  1-byte value containing 0 for FALSE or a 1 for TRUE.  Other\r
-    /// values are undefined.\r
-    ///\r
-    typedef unsigned char       BOOLEAN;\r
-    ///\r
-    /// 1-byte unsigned value\r
-    ///\r
-    typedef unsigned char       UINT8;\r
-    ///\r
-    /// 1-byte Character\r
-    ///\r
-    typedef char                CHAR8;\r
-    ///\r
-    /// 1-byte signed value\r
-    ///\r
-    typedef char                INT8;\r
-  #else\r
-\r
-    //\r
-    // Assume standard IA-32 alignment. \r
-    // Need to check portability of long long\r
-    //\r
+#if defined(_MSC_EXTENSIONS)\r
 \r
-    ///\r
-    /// 8-byte unsigned value\r
-    ///\r
-    typedef unsigned long long  UINT64;\r
-    ///\r
-    /// 8-byte signed value\r
-    ///\r
-    typedef long long           INT64;\r
-    ///\r
-    /// 4-byte unsigned value\r
-    ///\r
-    typedef unsigned int        UINT32;\r
-    ///\r
-    /// 4-byte signed value\r
-    ///\r
-    typedef int                 INT32;\r
-    ///\r
-    /// 2-byte unsigned value\r
-    ///\r
-    typedef unsigned short      UINT16;\r
-    ///\r
-    /// 2-byte Character.  Unless otherwise specified all strings are stored in the\r
-    /// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.\r
-    ///\r
-    typedef unsigned short      CHAR16;\r
-    ///\r
-    /// 2-byte signed value\r
-    ///\r
-    typedef short               INT16;\r
-    ///\r
-    /// Logical Boolean.  1-byte value containing 0 for FALSE or a 1 for TRUE.  Other\r
-    /// values are undefined.\r
-    ///\r
-    typedef unsigned char       BOOLEAN;\r
-    ///\r
-    /// 1-byte unsigned value\r
-    ///\r
-    typedef unsigned char       UINT8;\r
-    ///\r
-    /// 1-byte Character\r
-    ///\r
-    typedef char                CHAR8;\r
-    ///\r
-    /// 1-byte signed value\r
-    ///\r
-    typedef char                INT8;\r
-  #endif\r
-#else\r
   //\r
-  // Use ANSI C 2000 stdint.h integer width declarations\r
+  // use Microsoft C complier dependent integer width types \r
   //\r
-  #include <stdint.h>\r
 \r
+  ///\r
+  /// 8-byte unsigned value\r
+  ///\r
+  typedef unsigned __int64    UINT64;\r
+  ///\r
+  /// 8-byte signed value\r
+  ///\r
+  typedef __int64             INT64;\r
+  ///\r
+  /// 4-byte unsigned value\r
+  ///\r
+  typedef unsigned __int32    UINT32;\r
+  ///\r
+  /// 4-byte signed value\r
+  ///\r
+  typedef __int32             INT32;\r
+  ///\r
+  /// 2-byte unsigned value\r
+  ///\r
+  typedef unsigned short      UINT16;\r
+  ///\r
+  /// 2-byte Character.  Unless otherwise specified all strings are stored in the\r
+  /// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.\r
+  ///\r
+  typedef unsigned short      CHAR16;\r
+  ///\r
+  /// 2-byte signed value\r
+  ///\r
+  typedef short               INT16;\r
   ///\r
   /// Logical Boolean.  1-byte value containing 0 for FALSE or a 1 for TRUE.  Other\r
   /// values are undefined.\r
   ///\r
-  typedef uint8_t   BOOLEAN;\r
+  typedef unsigned char       BOOLEAN;\r
+  ///\r
+  /// 1-byte unsigned value\r
+  ///\r
+  typedef unsigned char       UINT8;\r
+  ///\r
+  /// 1-byte Character\r
+  ///\r
+  typedef char                CHAR8;\r
   ///\r
   /// 1-byte signed value\r
   ///\r
-  typedef int8_t    INT8;\r
+  typedef char                INT8;\r
+#else  \r
   ///\r
-  /// 1-byte unsigned value\r
+  /// 8-byte unsigned value\r
   ///\r
-  typedef uint8_t   UINT8;\r
+  typedef unsigned long long  UINT64;\r
   ///\r
-  /// 2-byte signed value\r
+  /// 8-byte signed value\r
   ///\r
-  typedef int16_t   INT16;\r
+  typedef long long           INT64;\r
   ///\r
-  /// 2-byte unsigned value\r
+  /// 4-byte unsigned value\r
   ///\r
-  typedef uint16_t  UINT16;\r
+  typedef unsigned int        UINT32;\r
   ///\r
   /// 4-byte signed value\r
   ///\r
-  typedef int32_t   INT32;\r
+  typedef int                 INT32;\r
   ///\r
-  /// 4-byte unsigned value\r
+  /// 2-byte unsigned value\r
   ///\r
-  typedef uint32_t  UINT32;\r
+  typedef unsigned short      UINT16;\r
   ///\r
-  /// 8-byte signed value\r
+  /// 2-byte Character.  Unless otherwise specified all strings are stored in the\r
+  /// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.\r
   ///\r
-  typedef int64_t   INT64;\r
+  typedef unsigned short      CHAR16;\r
   ///\r
-  /// 8-byte unsigned value\r
+  /// 2-byte signed value\r
+  ///\r
+  typedef short               INT16;\r
+  ///\r
+  /// Logical Boolean.  1-byte value containing 0 for FALSE or a 1 for TRUE.  Other\r
+  /// values are undefined.\r
+  ///\r
+  typedef unsigned char       BOOLEAN;\r
   ///\r
-  typedef uint64_t  UINT64;\r
+  /// 1-byte unsigned value\r
+  ///\r
+  typedef unsigned char       UINT8;\r
   ///\r
   /// 1-byte Character\r
   ///\r
-  typedef char      CHAR8;\r
+  typedef char                CHAR8;\r
   ///\r
-  /// 2-byte Character.  Unless otherwise specified all strings are stored in the\r
-  /// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.\r
+  /// 1-byte signed value\r
   ///\r
-  typedef uint16_t  CHAR16;\r
-\r
+  typedef char                INT8;\r
 #endif\r
 \r
 ///\r

diff --git a/MdePkg/Include/Ipf/ProcessorBind.h b/MdePkg/Include/Ipf/ProcessorBind.h
index e369b6e83a7d13c8974ba300ba07f5ad5f288b9b..c45df0de4d312bee83e3c1bbff9fe3e444a4ec7b 100644 (file)
--- a/MdePkg/Include/Ipf/ProcessorBind.h
+++ b/MdePkg/Include/Ipf/ProcessorBind.h
@@ -106,221 +106,104 @@
 \r
 #endif\r
 \r
-\r
-#if !defined (__STDC_VERSION__) || (__STDC_VERSION__) < 199901L\r
-  //\r
-  // No ANSI C 2000 stdint.h integer width declarations, so define equivalents\r
-  //\r
-\r
-  #if defined(_MSC_EXTENSIONS)\r
-    //\r
-    // use Microsoft C compiler dependent integer width types\r
-    //\r
-\r
-    ///\r
-    /// 8-byte unsigned value\r
-    ///\r
-    typedef unsigned __int64    UINT64;\r
-    ///\r
-    /// 8-byte signed value\r
-    ///\r
-    typedef __int64             INT64;\r
-    ///\r
-    /// 4-byte unsigned value\r
-    ///\r
-    typedef unsigned __int32    UINT32;\r
-    ///\r
-    /// 4-byte signed value\r
-    ///\r
-    typedef __int32             INT32;\r
-    ///\r
-    /// 2-byte unsigned value\r
-    ///\r
-    typedef unsigned short      UINT16;\r
-    ///\r
-    /// 2-byte Character.  Unless otherwise specified all strings are stored in the\r
-    /// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.\r
-    ///\r
-    typedef unsigned short      CHAR16;\r
-    ///\r
-    /// 2-byte signed value\r
-    ///\r
-    typedef short               INT16;\r
-    ///\r
-    /// Logical Boolean.  1-byte value containing 0 for FALSE or a 1 for TRUE.  Other\r
-    /// values are undefined.\r
-    ///\r
-    typedef unsigned char       BOOLEAN;\r
-    ///\r
-    /// 1-byte unsigned value\r
-    ///\r
-    typedef unsigned char       UINT8;\r
-    ///\r
-    /// 1-byte Character\r
-    ///\r
-    typedef char                CHAR8;\r
-    ///\r
-    /// 1-byte signed value\r
-    ///\r
-    typedef char                INT8;\r
-  #else\r
-    #if defined(_EFI_P64)\r
-      //\r
-      // P64 - pointers being 64-bit and longs and ints are 32-bits.\r
-      //\r
-\r
-      ///\r
-      /// 8-byte unsigned value\r
-      ///\r
-      typedef unsigned long long  UINT64;\r
-      ///\r
-      /// 8-byte signed value\r
-      ///\r
-      typedef long long           INT64;\r
-      ///\r
-      /// 4-byte unsigned value\r
-      ///\r
-      typedef unsigned int        UINT32;\r
-      ///\r
-      /// 4-byte signed value\r
-      ///\r
-      typedef int                 INT32;\r
-      ///\r
-      /// 2-byte Character.  Unless otherwise specified all strings are stored in the\r
-      /// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.\r
-      ///\r
-      typedef unsigned short      CHAR16;\r
-      ///\r
-      /// 2-byte unsigned value\r
-      ///\r
-      typedef unsigned short      UINT16;\r
-      ///\r
-      /// 2-byte signed value\r
-      ///\r
-      typedef short               INT16;\r
-      ///\r
-      /// Logical Boolean.  1-byte value containing 0 for FALSE or a 1 for TRUE.  Other\r
-      /// values are undefined.\r
-      ///\r
-      typedef unsigned char       BOOLEAN;\r
-      ///\r
-      /// 1-byte unsigned value\r
-      ///\r
-      typedef unsigned char       UINT8;\r
-      ///\r
-      /// 1-byte Character\r
-      ///\r
-      typedef char                CHAR8;\r
-      ///\r
-      /// 1-byte signed value\r
-      ///\r
-      typedef char                INT8;\r
-    #else\r
-      //\r
-      // Assume LP64 - longs and pointers are 64-bit. Ints are 32-bit.\r
-      //\r
-\r
-      ///\r
-      /// 8-byte unsigned value\r
-      ///\r
-      typedef unsigned long   UINT64;\r
-      ///\r
-      /// 8-byte signed value\r
-      ///\r
-      typedef long            INT64;\r
-      ///\r
-      /// 4-byte unsigned value\r
-      ///\r
-      typedef unsigned int    UINT32;\r
-      ///\r
-      /// 4-byte signed value\r
-      ///\r
-      typedef int             INT32;\r
-      ///\r
-      /// 2-byte unsigned value\r
-      ///\r
-      typedef unsigned short  UINT16;\r
-      ///\r
-      /// 2-byte Character.  Unless otherwise specified all strings are stored in the\r
-      /// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.\r
-      ///\r
-      typedef unsigned short  CHAR16;\r
-      ///\r
-      /// 2-byte signed value\r
-      ///\r
-      typedef short           INT16;\r
-      ///\r
-      /// Logical Boolean.  1-byte value containing 0 for FALSE or a 1 for TRUE.  Other\r
-      /// values are undefined.\r
-      ///\r
-      typedef unsigned char   BOOLEAN;\r
-      ///\r
-      /// 1-byte unsigned value\r
-      ///\r
-      typedef unsigned char   UINT8;\r
-      ///\r
-      /// 1-byte Character\r
-      ///\r
-      typedef char            CHAR8;\r
-      ///\r
-      /// 1-byte signed value\r
-      ///\r
-      typedef char            INT8;\r
-    #endif\r
-  #endif\r
-#else\r
+#if defined(_MSC_EXTENSIONS)\r
   //\r
-  // Use ANSI C 2000 stdint.h integer width declarations\r
+  // use Microsoft C compiler dependent integer width types\r
   //\r
-  #include <stdint.h>\r
 \r
+  ///\r
+  /// 8-byte unsigned value\r
+  ///\r
+  typedef unsigned __int64    UINT64;\r
+  ///\r
+  /// 8-byte signed value\r
+  ///\r
+  typedef __int64             INT64;\r
+  ///\r
+  /// 4-byte unsigned value\r
+  ///\r
+  typedef unsigned __int32    UINT32;\r
+  ///\r
+  /// 4-byte signed value\r
+  ///\r
+  typedef __int32             INT32;\r
+  ///\r
+  /// 2-byte unsigned value\r
+  ///\r
+  typedef unsigned short      UINT16;\r
+  ///\r
+  /// 2-byte Character.  Unless otherwise specified all strings are stored in the\r
+  /// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.\r
+  ///\r
+  typedef unsigned short      CHAR16;\r
+  ///\r
+  /// 2-byte signed value\r
+  ///\r
+  typedef short               INT16;\r
   ///\r
   /// Logical Boolean.  1-byte value containing 0 for FALSE or a 1 for TRUE.  Other\r
   /// values are undefined.\r
   ///\r
-  typedef uint8_t   BOOLEAN;\r
+  typedef unsigned char       BOOLEAN;\r
+  ///\r
+  /// 1-byte unsigned value\r
+  ///\r
+  typedef unsigned char       UINT8;\r
+  ///\r
+  /// 1-byte Character\r
+  ///\r
+  typedef char                CHAR8;\r
   ///\r
   /// 1-byte signed value\r
   ///\r
-  typedef int8_t    INT8;\r
+  typedef char                INT8;\r
+#else\r
   ///\r
-  /// 1-byte unsigned value\r
+  /// 8-byte unsigned value\r
   ///\r
-  typedef uint8_t   UINT8;\r
+  typedef unsigned long long  UINT64;\r
   ///\r
-  /// 2-byte signed value\r
+  /// 8-byte signed value\r
   ///\r
-  typedef int16_t   INT16;\r
+  typedef long long           INT64;\r
   ///\r
-  /// 2-byte unsigned value\r
+  /// 4-byte unsigned value\r
   ///\r
-  typedef uint16_t  UINT16;\r
+  typedef unsigned int        UINT32;\r
   ///\r
   /// 4-byte signed value\r
   ///\r
-  typedef int32_t   INT32;\r
+  typedef int                 INT32;\r
   ///\r
-  /// 4-byte unsigned value\r
+  /// 2-byte unsigned value\r
   ///\r
-  typedef uint32_t  UINT32;\r
+  typedef unsigned short      UINT16;\r
   ///\r
-  /// 8-byte signed value\r
+  /// 2-byte Character.  Unless otherwise specified all strings are stored in the\r
+  /// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.\r
   ///\r
-  typedef int64_t   INT64;\r
+  typedef unsigned short      CHAR16;\r
   ///\r
-  /// 8-byte unsigned value\r
+  /// 2-byte signed value\r
+  ///\r
+  typedef short               INT16;\r
+  ///\r
+  /// Logical Boolean.  1-byte value containing 0 for FALSE or a 1 for TRUE.  Other\r
+  /// values are undefined.\r
   ///\r
-  typedef uint64_t  UINT64;\r
+  typedef unsigned char       BOOLEAN;\r
+  ///\r
+  /// 1-byte unsigned value\r
+  ///\r
+  typedef unsigned char       UINT8;\r
   ///\r
   /// 1-byte Character\r
   ///\r
-  typedef char      CHAR8;\r
+  typedef char                CHAR8;\r
   ///\r
-  /// 2-byte Character.  Unless otherwise specified all strings are stored in the\r
-  /// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.\r
+  /// 1-byte signed value\r
   ///\r
-  typedef uint16_t  CHAR16;\r
-\r
+  typedef char                INT8;\r
 #endif\r
 \r
 ///\r

diff --git a/MdePkg/Include/X64/ProcessorBind.h b/MdePkg/Include/X64/ProcessorBind.h
index 2512ff17a3722714ed67d251dd218ef453604fdd..b22d654ae6315b64c0c068c4dc58a3a011e98066 100644 (file)
--- a/MdePkg/Include/X64/ProcessorBind.h
+++ b/MdePkg/Include/X64/ProcessorBind.h
@@ -97,220 +97,104 @@
 #endif\r
 \r
 \r
-#if !defined(__GNUC__) && (__STDC_VERSION__ < 199901L)\r
-  //\r
-  // No ANSI C 2000 stdint.h integer width declarations, so define equivalents\r
-  //\r
- \r
-  #if defined(_MSC_EXTENSIONS)\r
-    //\r
-    // use Microsoft C complier dependent integer width types \r
-    //\r
-\r
-    ///\r
-    /// 8-byte unsigned value\r
-    ///\r
-    typedef unsigned __int64    UINT64;\r
-    ///\r
-    /// 8-byte signed value\r
-    ///\r
-    typedef __int64             INT64;\r
-    ///\r
-    /// 4-byte unsigned value\r
-    ///\r
-    typedef unsigned __int32    UINT32;\r
-    ///\r
-    /// 4-byte signed value\r
-    ///\r
-    typedef __int32             INT32;\r
-    ///\r
-    /// 2-byte unsigned value\r
-    ///\r
-    typedef unsigned short      UINT16;\r
-    ///\r
-    /// 2-byte Character.  Unless otherwise specified all strings are stored in the\r
-    /// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.\r
-    ///\r
-    typedef unsigned short      CHAR16;\r
-    ///\r
-    /// 2-byte signed value\r
-    ///\r
-    typedef short               INT16;\r
-    ///\r
-    /// Logical Boolean.  1-byte value containing 0 for FALSE or a 1 for TRUE.  Other\r
-    /// values are undefined.\r
-    ///\r
-    typedef unsigned char       BOOLEAN;\r
-    ///\r
-    /// 1-byte unsigned value\r
-    ///\r
-    typedef unsigned char       UINT8;\r
-    ///\r
-    /// 1-byte Character\r
-    ///\r
-    typedef char                CHAR8;\r
-    ///\r
-    /// 1-byte signed value\r
-    ///\r
-    typedef char                INT8;\r
-  #else\r
-    #if defined(_EFI_P64)\r
-      //\r
-      // P64 - pointers being 64-bit and longs and ints are 32-bits.\r
-      //\r
-\r
-      ///\r
-      /// 8-byte unsigned value\r
-      ///\r
-      typedef unsigned long long  UINT64;\r
-      ///\r
-      /// 8-byte signed value\r
-      ///\r
-      typedef long long           INT64;\r
-      ///\r
-      /// 4-byte unsigned value\r
-      ///\r
-      typedef unsigned int        UINT32;\r
-      ///\r
-      /// 4-byte signed value\r
-      ///\r
-      typedef int                 INT32;\r
-      ///\r
-      /// 2-byte Character.  Unless otherwise specified all strings are stored in the\r
-      /// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.\r
-      ///\r
-      typedef unsigned short      CHAR16;\r
-      ///\r
-      /// 2-byte unsigned value\r
-      ///\r
-      typedef unsigned short      UINT16;\r
-      ///\r
-      /// 2-byte signed value\r
-      ///\r
-      typedef short               INT16;\r
-      ///\r
-      /// Logical Boolean.  1-byte value containing 0 for FALSE or a 1 for TRUE.  Other\r
-      /// values are undefined.\r
-      ///\r
-      typedef unsigned char       BOOLEAN;\r
-      ///\r
-      /// 1-byte unsigned value\r
-      ///\r
-      typedef unsigned char       UINT8;\r
-      ///\r
-      /// 1-byte Character\r
-      ///\r
-      typedef char                CHAR8;\r
-      ///\r
-      /// 1-byte signed value\r
-      ///\r
-      typedef char                INT8;\r
-    #else\r
-      //\r
-      // Assume LP64 - longs and pointers are 64-bit. Ints are 32-bit.\r
-      //\r
-\r
-      ///\r
-      /// 8-byte unsigned value\r
-      ///\r
-      typedef unsigned long   UINT64;\r
-      ///\r
-      /// 8-byte signed value\r
-      ///\r
-      typedef long            INT64;\r
-      ///\r
-      /// 4-byte unsigned value\r
-      ///\r
-      typedef unsigned int    UINT32;\r
-      ///\r
-      /// 4-byte signed value\r
-      ///\r
-      typedef int             INT32;\r
-      ///\r
-      /// 2-byte unsigned value\r
-      ///\r
-      typedef unsigned short  UINT16;\r
-      ///\r
-      /// 2-byte Character.  Unless otherwise specified all strings are stored in the\r
-      /// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.\r
-      ///\r
-      typedef unsigned short  CHAR16;\r
-      ///\r
-      /// 2-byte signed value\r
-      ///\r
-      typedef short           INT16;\r
-      ///\r
-      /// Logical Boolean.  1-byte value containing 0 for FALSE or a 1 for TRUE.  Other\r
-      /// values are undefined.\r
-      ///\r
-      typedef unsigned char   BOOLEAN;\r
-      ///\r
-      /// 1-byte unsigned value\r
-      ///\r
-      typedef unsigned char   UINT8;\r
-      ///\r
-      /// 1-byte Character\r
-      ///\r
-      typedef char            CHAR8;\r
-      ///\r
-      /// 1-byte signed value\r
-      ///\r
-      typedef char            INT8;\r
-    #endif\r
-  #endif\r
-#else\r
+#if defined(_MSC_EXTENSIONS)\r
   //\r
-  // Use ANSI C 2000 stdint.h integer width declarations\r
+  // use Microsoft C complier dependent integer width types \r
   //\r
-  #include <stdint.h>\r
 \r
+  ///\r
+  /// 8-byte unsigned value\r
+  ///\r
+  typedef unsigned __int64    UINT64;\r
+  ///\r
+  /// 8-byte signed value\r
+  ///\r
+  typedef __int64             INT64;\r
+  ///\r
+  /// 4-byte unsigned value\r
+  ///\r
+  typedef unsigned __int32    UINT32;\r
+  ///\r
+  /// 4-byte signed value\r
+  ///\r
+  typedef __int32             INT32;\r
+  ///\r
+  /// 2-byte unsigned value\r
+  ///\r
+  typedef unsigned short      UINT16;\r
+  ///\r
+  /// 2-byte Character.  Unless otherwise specified all strings are stored in the\r
+  /// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.\r
+  ///\r
+  typedef unsigned short      CHAR16;\r
+  ///\r
+  /// 2-byte signed value\r
+  ///\r
+  typedef short               INT16;\r
   ///\r
   /// Logical Boolean.  1-byte value containing 0 for FALSE or a 1 for TRUE.  Other\r
   /// values are undefined.\r
   ///\r
-  typedef uint8_t   BOOLEAN;\r
+  typedef unsigned char       BOOLEAN;\r
+  ///\r
+  /// 1-byte unsigned value\r
+  ///\r
+  typedef unsigned char       UINT8;\r
+  ///\r
+  /// 1-byte Character\r
+  ///\r
+  typedef char                CHAR8;\r
   ///\r
   /// 1-byte signed value\r
   ///\r
-  typedef int8_t    INT8;\r
+  typedef char                INT8;\r
+#else\r
   ///\r
-  /// 1-byte unsigned value\r
+  /// 8-byte unsigned value\r
   ///\r
-  typedef uint8_t   UINT8;\r
+  typedef unsigned long long  UINT64;\r
   ///\r
-  /// 2-byte signed value\r
+  /// 8-byte signed value\r
   ///\r
-  typedef int16_t   INT16;\r
+  typedef long long           INT64;\r
   ///\r
-  /// 2-byte unsigned value\r
+  /// 4-byte unsigned value\r
   ///\r
-  typedef uint16_t  UINT16;\r
+  typedef unsigned int        UINT32;\r
   ///\r
   /// 4-byte signed value\r
   ///\r
-  typedef int32_t   INT32;\r
+  typedef int                 INT32;\r
   ///\r
-  /// 4-byte unsigned value\r
+  /// 2-byte unsigned value\r
   ///\r
-  typedef uint32_t  UINT32;\r
+  typedef unsigned short      UINT16;\r
   ///\r
-  /// 8-byte signed value\r
+  /// 2-byte Character.  Unless otherwise specified all strings are stored in the\r
+  /// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.\r
   ///\r
-  typedef int64_t   INT64;\r
+  typedef unsigned short      CHAR16;\r
   ///\r
-  /// 8-byte unsigned value\r
+  /// 2-byte signed value\r
+  ///\r
+  typedef short               INT16;\r
+  ///\r
+  /// Logical Boolean.  1-byte value containing 0 for FALSE or a 1 for TRUE.  Other\r
+  /// values are undefined.\r
   ///\r
-  typedef uint64_t  UINT64;\r
+  typedef unsigned char       BOOLEAN;\r
+  ///\r
+  /// 1-byte unsigned value\r
+  ///\r
+  typedef unsigned char       UINT8;\r
   ///\r
   /// 1-byte Character\r
   ///\r
-  typedef char      CHAR8;\r
+  typedef char                CHAR8;\r
   ///\r
-  /// 2-byte Character.  Unless otherwise specified all strings are stored in the\r
-  /// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.\r
+  /// 1-byte signed value\r
   ///\r
-  typedef uint16_t  CHAR16;\r
-\r
+  typedef char                INT8;\r
 #endif\r
 \r
 ///\r