diff options
| author | Jamie Madill <jmadill@chromium.org> | 2013-10-30 17:53:15 -0400 |
|---|---|---|
| committer | Jamie Madill <jmadill@chromium.org> | 2013-10-30 17:53:15 -0400 |
| commit | 817951245a5ddacdf99e1b88a92fdb9d0e34d92d (patch) | |
| tree | c03fd93e256955016a8a9904857d593842adda91 | |
| parent | 297eb16dd3c2e7c02d75c681569d76884e6e520c (diff) | |
| download | angle_dx11-817951245a5ddacdf99e1b88a92fdb9d0e34d92d.tar.gz | |
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
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | src/compiler/InfoSink.h | 1 | ||||
| -rw-r--r-- | src/compiler/preprocessor/ExpressionParser.cpp | 1 | ||||
| -rw-r--r-- | src/compiler/preprocessor/ExpressionParser.y | 1 |
4 files changed, 4 insertions, 0 deletions
@@ -13,6 +13,7 @@ TransGaming Inc. Adobe Systems Inc. Autodesk, Inc. +BlackBerry Limited Cloud Party, Inc. Intel Corporation Mozilla Corporation diff --git a/src/compiler/InfoSink.h b/src/compiler/InfoSink.h index 68888381..be0ddffe 100644 --- a/src/compiler/InfoSink.h +++ b/src/compiler/InfoSink.h @@ -8,6 +8,7 @@ #define _INFOSINK_INCLUDED_ #include <math.h> +#include <stdlib.h> #include "compiler/Common.h" // Returns the fractional part of the given floating-point number. diff --git a/src/compiler/preprocessor/ExpressionParser.cpp b/src/compiler/preprocessor/ExpressionParser.cpp index 67966e95..2fcda35b 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 b6d3143e..bb2e81a4 100644 --- a/src/compiler/preprocessor/ExpressionParser.y +++ b/src/compiler/preprocessor/ExpressionParser.y @@ -33,6 +33,7 @@ WHICH GENERATES THE GLSL ES preprocessor expression parser. #include "ExpressionParser.h" +#include <malloc.h> #include <cassert> #include <sstream> |