michael@0: From: Ehsan Akhagri <ehsan@mozilla.com>
michael@0: Subject: Bug 939588 - Fixes required to make angle compile in unified mode
michael@0: 
michael@0: diff --git a/gfx/angle/src/compiler/ForLoopUnroll.h b/gfx/angle/src/compiler/ForLoopUnroll.h
michael@0: index e800e25..7e10d82 100644
michael@0: --- a/gfx/angle/src/compiler/ForLoopUnroll.h
michael@0: +++ b/gfx/angle/src/compiler/ForLoopUnroll.h
michael@0: @@ -1,14 +1,17 @@
michael@0:  //
michael@0:  // Copyright (c) 2011 The ANGLE Project Authors. All rights reserved.
michael@0:  // Use of this source code is governed by a BSD-style license that can be
michael@0:  // found in the LICENSE file.
michael@0:  //
michael@0:  
michael@0: +#ifndef ForLoopUnroll_h
michael@0: +#define ForLoopUnroll_h
michael@0: +
michael@0:  #include "compiler/intermediate.h"
michael@0:  
michael@0:  struct TLoopIndexInfo {
michael@0:      int id;
michael@0:      int initValue;
michael@0:      int stopValue;
michael@0:      int incrementValue;
michael@0:      TOperator op;
michael@0: @@ -41,8 +44,9 @@ public:
michael@0:  private:
michael@0:      int getLoopIncrement(TIntermLoop* node);
michael@0:  
michael@0:      int evaluateIntConstant(TIntermConstantUnion* node);
michael@0:  
michael@0:      TVector<TLoopIndexInfo> mLoopIndexStack;
michael@0:  };
michael@0:  
michael@0: +#endif
michael@0: diff --git a/gfx/angle/src/compiler/preprocessor/DiagnosticsBase.h b/gfx/angle/src/compiler/preprocessor/DiagnosticsBase.h
michael@0: index 07bc411..e1829b0 100644
michael@0: --- a/gfx/angle/src/compiler/preprocessor/DiagnosticsBase.h
michael@0: +++ b/gfx/angle/src/compiler/preprocessor/DiagnosticsBase.h
michael@0: @@ -4,16 +4,21 @@
michael@0:  // found in the LICENSE file.
michael@0:  //
michael@0:  
michael@0:  #ifndef COMPILER_PREPROCESSOR_DIAGNOSTICS_H_
michael@0:  #define COMPILER_PREPROCESSOR_DIAGNOSTICS_H_
michael@0:  
michael@0:  #include <string>
michael@0:  
michael@0: +// Windows.h #defines ERROR.
michael@0: +#ifdef ERROR
michael@0: +#undef ERROR
michael@0: +#endif
michael@0: +
michael@0:  namespace pp
michael@0:  {
michael@0:  
michael@0:  struct SourceLocation;
michael@0:  
michael@0:  // Base class for reporting diagnostic messages.
michael@0:  // Derived classes are responsible for formatting and printing the messages.
michael@0:  class Diagnostics