edk2/EdkCompatibilityPkg/Foundation/Efi/Include/EfiTypes.h:

  UNALIGNED is already defined by including 'windows.h' in the
  EdkCompatibilityPkg/Sample/Library/Dxe/WinNt/WinNtLib.inf module.

  For X64/IPF, the definition (via windows.h) is not blank (as
  it is here).  Therefore, a 're-definition' warning is generated.

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

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Include/EfiTypes.h b/EdkCompatibilityPkg/Foundation/Efi/Include/EfiTypes.h
index 25a6e02ee960061841d37ccd2d743be0ce50ee97..7d8b43f9f9d606eac131830fe31fef1d6b008462 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Efi/Include/EfiTypes.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Include/EfiTypes.h
@@ -53,7 +53,10 @@ typedef UINT64 EFI_LBA;
 #define OUT\r
 #define OPTIONAL\r
 #endif\r
+\r
+#ifndef UNALIGNED\r
 #define UNALIGNED\r
+#endif\r
 \r
 //\r
 // Modifiers for EFI Runtime and Boot Services\r