Update IntelFrameworkPkg

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

2 files changed, 11 insertions, 3 deletions

diff --git a/IntelFrameworkPkg/Include/Library/HiiLib.h b/IntelFrameworkPkg/Include/Library/FrameworkHiiLib.h
index 51fde1460d..d2d74336a0 100644
--- a/IntelFrameworkPkg/Include/Library/HiiLib.h
+++ b/IntelFrameworkPkg/Include/Library/FrameworkHiiLib.h
@@ -17,6 +17,8 @@
 #ifndef __HII_LIB_H__

 #define __HII_LIB_H__

 

+#include <Protocol/FrameworkHii.h>

+

 /**

   This function allocates pool for an EFI_HII_PACKAGES structure

   with enough space for the variable argument list of package pointers.

diff --git a/IntelFrameworkPkg/Include/Protocol/Hii.h b/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h
index fbecbef8ae..0cb71eb59b 100644
--- a/IntelFrameworkPkg/Include/Protocol/Hii.h
+++ b/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h
@@ -12,15 +12,21 @@
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

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

 

-  Module Name:  Hii.h

+  Module Name:  FrameworkHii.h

 

   @par Revision Reference:

   This protocol is defined in HII spec 0.92.

 

 **/

 

-#ifndef _HII_H_

-#define _HII_H_

+#ifndef _FRAMEWORK_HII_H_

+#define _FRAMEWORK_HII_H_

+

+//

+// To get EFI_GRAPHICS_OUTPUT_BLT_PIXEL,

+// is defined in MdePkg/Protocol/GraphicsOutput.h

+//

+#include <Protocol/GraphicsOutput.h>

 

 #define EFI_HII_PROTOCOL_GUID \

   { \