Skip to content

A
angle
Commit 81795124 by Jamie Madill
Options

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
parent 297eb16d
Showing with 4 additions and 0 deletions
AUTHORS
...@@ -13,6 +13,7 @@ TransGaming Inc. ...@@ -13,6 +13,7 @@ TransGaming Inc.
Adobe Systems Inc. Adobe Systems Inc.
Autodesk, Inc. Autodesk, Inc.
BlackBerry Limited
Cloud Party, Inc. Cloud Party, Inc.
Intel Corporation Intel Corporation
Mozilla Corporation Mozilla Corporation
......
src/compiler/InfoSink.h
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#define _INFOSINK_INCLUDED_ #define _INFOSINK_INCLUDED_
#include <math.h> #include <math.h>
#include <stdlib.h>
#include "compiler/Common.h" #include "compiler/Common.h"
// Returns the fractional part of the given floating-point number. // Returns the fractional part of the given floating-point number.
......
src/compiler/preprocessor/ExpressionParser.cpp
...@@ -92,6 +92,7 @@ ...@@ -92,6 +92,7 @@
#include "ExpressionParser.h" #include "ExpressionParser.h"
#include <malloc.h>
#include <cassert> #include <cassert>
#include <sstream> #include <sstream>
......
src/compiler/preprocessor/ExpressionParser.y
...@@ -33,6 +33,7 @@ WHICH GENERATES THE GLSL ES preprocessor expression parser. ...@@ -33,6 +33,7 @@ WHICH GENERATES THE GLSL ES preprocessor expression parser.
#include "ExpressionParser.h" #include "ExpressionParser.h"
#include <malloc.h>
#include <cassert> #include <cassert>
#include <sstream> #include <sstream>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment