gfx/angle/angle-build-unified.patch
author B2G Bumper Bot <release+b2gbumper@mozilla.com>
Mon, 09 Jun 2014 01:46:12 -0700
changeset 206794 d8bcbb0d8cc495418700c4f508cda13fef1f0f30
parent 169702 bb22a67c42f8cdcec53dad9a8db8a48a9854b9de
permissions -rw-r--r--
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/158e218cc9ec Author: Arthur Chen <crh0716@gmail.com> Desc: Merge pull request #20064 from crh0716/1016219 Bug 1016219 - Call to specific panel function when visibility changes r=eragon ======== https://hg.mozilla.org/integration/gaia-central/rev/58cf2e2cd4e1 Author: Arthur Chen <crh0716@gmail.com> Desc: Bug 1016219 - Call to specific panel function when visibility changes

From: Ehsan Akhagri <ehsan@mozilla.com>
Subject: Bug 939588 - Fixes required to make angle compile in unified mode

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