| commit | d7f2135fcc5b3cbe0a50205fb07159cd97c66886 | [log] [tgz] |
|---|---|---|
| author | Jamie Madill <jmadill@chromium.org> | Wed Oct 30 17:53:15 2013 -0400 |
| committer | Shannon Woods <shannonwoods@chromium.org> | Mon Dec 09 21:54:23 2013 +0000 |
| tree | 69d3d0a82fad86ffcf1f1df8b7da4b6aa715442a | |
| parent | 827a471b7436ae43a31b01753cca13a6ff41e12d [diff] |
Fix build on QNX. InfoSink.h needs stdlib.h for abs(int) and free() in the global namespace. ExpressionParser needs malloc.h, because bison needs malloc and free in the global namespace, but "#include <cassert>" will put it only in the std:: namespace on QNX. BUG=500 R=geofflang@chromium.org, shannonwoods@chromium.org Review URL: https://codereview.appspot.com/19330044 Conflicts: src/compiler/translator/InfoSink.h Change-Id: Ie480d5c293d099f21dafc8c1e7997c0b4cda7207 Reviewed-on: https://chromium-review.googlesource.com/178998 Reviewed-by: Shannon Woods <shannonwoods@chromium.org> Tested-by: Shannon Woods <shannonwoods@chromium.org>
diff --git a/src/compiler/preprocessor/ExpressionParser.cpp b/src/compiler/preprocessor/ExpressionParser.cpp index 1544333..9603274 100644 --- a/src/compiler/preprocessor/ExpressionParser.cpp +++ b/src/compiler/preprocessor/ExpressionParser.cpp
@@ -92,6 +92,7 @@ #include "ExpressionParser.h" +#include <malloc.h> #include <cassert> #include <sstream>
diff --git a/src/compiler/preprocessor/ExpressionParser.y b/src/compiler/preprocessor/ExpressionParser.y index b6d3143..bb2e81a 100644 --- a/src/compiler/preprocessor/ExpressionParser.y +++ b/src/compiler/preprocessor/ExpressionParser.y
@@ -33,6 +33,7 @@ #include "ExpressionParser.h" +#include <malloc.h> #include <cassert> #include <sstream>