Rename the global variable to avoid possible symbol conflict.

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

diff --git a/MdePkg/Library/UefiIfrSupportLib/UefiIfrForm.c b/MdePkg/Library/UefiIfrSupportLib/UefiIfrForm.c
index c175df2e79edba07705f610d4c95b36c53a48599..f41fc25d520265a0db4e1b86f08c5cd77074b3e9 100644 (file)
--- a/MdePkg/Library/UefiIfrSupportLib/UefiIfrForm.c
+++ b/MdePkg/Library/UefiIfrSupportLib/UefiIfrForm.c
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "UefiIfrLibraryInternal.h"
 
 CONST EFI_FORM_BROWSER2_PROTOCOL      *mFormBrowser2     = NULL;
 #include "UefiIfrLibraryInternal.h"
 
 CONST EFI_FORM_BROWSER2_PROTOCOL      *mFormBrowser2     = NULL;

-CONST EFI_HII_CONFIG_ROUTING_PROTOCOL *mHiiConfigRouting = NULL;
+CONST EFI_HII_CONFIG_ROUTING_PROTOCOL *mIfrSupportLibHiiConfigRouting = NULL;

 
 /**
   This function locate FormBrowser2 protocols for later usage.
 
 /**
   This function locate FormBrowser2 protocols for later usage.


@@ -39,8 +39,8 @@ LocateFormBrowser2Protocols (
     }
   }
   
     }
   }
   

-  if (mHiiConfigRouting == NULL) {
-    Status = gBS->LocateProtocol (&gEfiHiiConfigRoutingProtocolGuid, NULL, (VOID **) &mHiiConfigRouting);
+  if (mIfrSupportLibHiiConfigRouting == NULL) {
+    Status = gBS->LocateProtocol (&gEfiHiiConfigRoutingProtocolGuid, NULL, (VOID **) &mIfrSupportLibHiiConfigRouting);

     if (EFI_ERROR (Status)) {
       return Status;
     }
     if (EFI_ERROR (Status)) {
       return Status;
     }


@@ -809,8 +809,8 @@ GetBrowserData (
   //
   // Convert <ConfigResp> to buffer data
   //
   //
   // Convert <ConfigResp> to buffer data
   //

-  Status = mHiiConfigRouting->ConfigToBlock (
-                               mHiiConfigRouting,
+  Status = mIfrSupportLibHiiConfigRouting->ConfigToBlock (
+                               mIfrSupportLibHiiConfigRouting,

                                ConfigResp,
                                Buffer,
                                BufferSize,
                                ConfigResp,
                                Buffer,
                                BufferSize,


@@ -909,8 +909,8 @@ SetBrowserData (
   //
   // Convert buffer to <ConfigResp>
   //
   //
   // Convert buffer to <ConfigResp>
   //

-  Status = mHiiConfigRouting->BlockToConfig (
-                                mHiiConfigRouting,
+  Status = mIfrSupportLibHiiConfigRouting->BlockToConfig (
+                                mIfrSupportLibHiiConfigRouting,

                                 ConfigRequest,
                                 Buffer,
                                 BufferSize,
                                 ConfigRequest,
                                 Buffer,
                                 BufferSize,