Merge branch 'master' into js-modules

1 files changed, 8 insertions, 4 deletions

diff --git a/gfx/angle/src/compiler/preprocessor/Macro.cpp b/gfx/angle/src/compiler/preprocessor/Macro.cpp
index f5c94399d..4c4d5fd2e 100755
--- a/gfx/angle/src/compiler/preprocessor/Macro.cpp
+++ b/gfx/angle/src/compiler/preprocessor/Macro.cpp
@@ -4,10 +4,11 @@
 // found in the LICENSE file.
 //
 
-#include "compiler/preprocessor/Macro.h"
+#include "Macro.h"
 
-#include "common/angleutils.h"
-#include "compiler/preprocessor/Token.h"
+#include <sstream>
+
+#include "Token.h"
 
 namespace pp
 {
@@ -22,9 +23,12 @@ bool Macro::equals(const Macro &other) const
 
 void PredefineMacro(MacroSet *macroSet, const char *name, int value)
 {
+    std::ostringstream stream;
+    stream << value;
+
     Token token;
     token.type = Token::CONST_INT;
-    token.text = ToString(value);
+    token.text = stream.str();
 
     Macro macro;
     macro.predefined = true;