Bug 732764 - gfx/angle/src/compiler/Types.h:211: error: 'abort' was not declared in this scope. r=bjacob
authorOleg Romashin <romaxa@gmail.com>
Sun, 04 Mar 2012 20:50:44 -0500
changeset 88443 71995d5b92a111a7e2d42abc8299f2e664050cee
parent 88442 03338969ab9ebc3756653cb115aaf24b7ef242d1
child 88444 8706180542ed9fafd252757ea63c10fcafadb278
push id157
push userMs2ger@gmail.com
push dateWed, 07 Mar 2012 19:27:10 +0000
reviewersbjacob
bugs732764
milestone13.0a1
Bug 732764 - gfx/angle/src/compiler/Types.h:211: error: 'abort' was not declared in this scope. r=bjacob
gfx/angle/angle-castrate-bug-241.patch
gfx/angle/src/compiler/Types.h
--- a/gfx/angle/angle-castrate-bug-241.patch
+++ b/gfx/angle/angle-castrate-bug-241.patch
@@ -21,17 +21,35 @@ diff --git a/gfx/angle/README.mozilla b/
  == How to update this ANGLE copy ==
  
  1. Unapply patches
  2. Apply diff with new ANGLE version
  3. Reapply patches.
 diff --git a/gfx/angle/src/compiler/Types.h b/gfx/angle/src/compiler/Types.h
 --- a/gfx/angle/src/compiler/Types.h
 +++ b/gfx/angle/src/compiler/Types.h
-@@ -203,17 +203,17 @@ public:
+@@ -5,16 +5,17 @@
+ //
+ 
+ #ifndef _TYPES_INCLUDED
+ #define _TYPES_INCLUDED
+ 
+ #include "compiler/BaseTypes.h"
+ #include "compiler/Common.h"
+ #include "compiler/compilerdebug.h"
++#include <cstdlib>
+ 
+ //
+ // Need to have association of line numbers to types in a list for building structs.
+ //
+ class TType;
+ struct TTypeLine {
+     TType* type;
+     int line;
+@@ -203,17 +204,17 @@ public:
      bool isVector() const { return size > 1 && !matrix; }
      bool isScalar() const { return size == 1 && !matrix && !structure; }
  
      TTypeList* getStruct() const { return structure; }
      void setStruct(TTypeList* s) { structure = s; computeDeepestStructNesting(); }
  
      const TString& getTypeName() const
      {
--- a/gfx/angle/src/compiler/Types.h
+++ b/gfx/angle/src/compiler/Types.h
@@ -5,16 +5,17 @@
 //
 
 #ifndef _TYPES_INCLUDED
 #define _TYPES_INCLUDED
 
 #include "compiler/BaseTypes.h"
 #include "compiler/Common.h"
 #include "compiler/compilerdebug.h"
+#include <cstdlib>
 
 //
 // Need to have association of line numbers to types in a list for building structs.
 //
 class TType;
 struct TTypeLine {
     TType* type;
     int line;