commit b3077d086b365b1d54c3d755df19c6f8f349a562
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Fri Jan 11 04:12:09 2013 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Fri Jan 11 04:12:09 2013 +0000
tree 9777eda55bc65f42b016137597132736d27f7ca7
parent b35da7afe3c262235d66aeed64579c57b2f7ac0b

Upstream various build fixes from WebKit to ANGLE to make updating ANGLE in WebKit easier.

a) http://trac.webkit.org/changeset/127747
b) http://trac.webkit.org/changeset/128539
c) http://trac.webkit.org/changeset/122870 - Specifically, items #3 and #4 in this changeset's commit message.

Review URL: https://codereview.appspot.com/7040045


Author:    maxvujovic@gmail.com
------

Upodate preprocessor.vcxproj to reflect changes in r1640.

Review URL: https://codereview.appspot.com/7061044

git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1703 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/compiler/intermediate.h

diff --git a/src/compiler/intermediate.h b/src/compiler/intermediate.h
index 09454f6..2a3ad9c 100644
--- a/src/compiler/intermediate.h
+++ b/src/compiler/intermediate.h
@@ -183,7 +183,7 @@
     EOpVectorTimesScalarAssign,
     EOpMatrixTimesScalarAssign,
     EOpMatrixTimesMatrixAssign,
-    EOpDivAssign,
+    EOpDivAssign
 };
 
 extern const char* getOperatorString(TOperator op);
@@ -273,7 +273,7 @@
 enum TLoopType {
     ELoopFor,
     ELoopWhile,
-    ELoopDoWhile,
+    ELoopDoWhile
 };
 
 class TIntermLoop : public TIntermNode {