Sync BaseTool trunk (version r2599) into EDKII BaseTools.

Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Heshen Chen <chen.heshen@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14591 6f19259b-4bc3-4df7-8a09-765794883524

BaseTools/Source/C/VfrCompile/VfrCompiler.h

@@ -57,6 +57,7 @@ typedef struct {
   BOOLEAN CompatibleMode;
   BOOLEAN HasOverrideClassGuid;
   EFI_GUID OverrideClassGuid;
+  BOOLEAN WarningAsError;
 } OPTIONS;
 
 typedef enum {
@@ -87,6 +88,7 @@ private:
 
   VOID    SET_RUN_STATUS (IN COMPILER_RUN_STATUS);
   BOOLEAN IS_RUN_STATUS (IN COMPILER_RUN_STATUS);
+  VOID    UpdateInfoForDynamicOpcode (VOID);
 
 public:
   COMPILER_RUN_STATUS RunStatus (VOID) {