3 files changed, 5 insertions, 4 deletions
diff --git a/MdePkg/Include/Pi/PiFirmwareVolume.h b/MdePkg/Include/Pi/PiFirmwareVolume.h
index 7675df016c..8406f4abde 100644
--- a/MdePkg/Include/Pi/PiFirmwareVolume.h
+++ b/MdePkg/Include/Pi/PiFirmwareVolume.h
@@ -30,7 +30,7 @@ typedef UINT32  EFI_FV_FILE_ATTRIBUTES;
 #define EFI_FV_FILE_ATTRIB_FIXED          0x00000100
 #define EFI_FV_FILE_ATTRIB_MEMORY_MAPPED  0x00000200
 
-typedef UINT32  EFI_FVB_ATTRIBUTES;
+typedef UINT32  EFI_FVB2_ATTRIBUTES;
 
 // 
 // Attributes bit definitions
@@ -98,7 +98,7 @@ typedef struct {
   EFI_GUID                  FileSystemGuid;
   UINT64                    FvLength;
   UINT32                    Signature;
-  EFI_FVB_ATTRIBUTES        Attributes;
+  EFI_FVB2_ATTRIBUTES        Attributes;
   UINT16                    HeaderLength;
   UINT16                    Checksum;
   UINT16                    ExtHeaderOffset;
diff --git a/MdePkg/Include/Pi/PiPeiCis.h b/MdePkg/Include/Pi/PiPeiCis.h
index da7c46e587..59bff01f53 100644
--- a/MdePkg/Include/Pi/PiPeiCis.h
+++ b/MdePkg/Include/Pi/PiPeiCis.h
@@ -607,7 +607,7 @@ EFI_STATUS
 
 **/
 typedef struct {
-  EFI_FVB_ATTRIBUTES  FvAttributes;
+  EFI_FVB2_ATTRIBUTES FvAttributes;
   EFI_GUID            FvFormat;
   EFI_GUID            FvName;
   VOID                *FvStart;
diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
index 9fec1bcae9..6f076f7578 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
@@ -36,6 +36,7 @@ unsigned short _outpw (unsigned short port, unsigned short dataword );
 unsigned long  _outpd (unsigned short port, unsigned long dataword );
 void          _ReadWriteBarrier (void);
 
+#ifdef _MSC_VER
 #pragma intrinsic(_inp)
 #pragma intrinsic(_inpw)
 #pragma intrinsic(_inpd)
@@ -43,7 +44,7 @@ void          _ReadWriteBarrier (void);
 #pragma intrinsic(_outpw)
 #pragma intrinsic(_outpd)
 #pragma intrinsic(_ReadWriteBarrier)
-
+#endif 
 //
 // _ReadWriteBarrier() forces memory reads and writes to complete at the point
 // in the call. This is only a hint to the compiler and does emit code.