Skip to content

A
angle
Commit a738f085 by Jamie Madill Committed by Shannon Woods
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, jmadill@chromium.org, shannonwoods@chromium.org, zmo@chromium.org Review URL: https://codereview.appspot.com/19330044 Change-Id: Ifa30a8ba5eced1156123416d4a24b490620721af Reviewed-on: https://chromium-review.googlesource.com/178993Reviewed-by: 's avatarShannon Woods <shannonwoods@chromium.org> Tested-by: 's avatarShannon Woods <shannonwoods@chromium.org>
parent d7f2135f
Showing with 10 additions and 0 deletions
src/compiler/preprocessor/ExpressionParser.cpp
...@@ -92,7 +92,12 @@ ...@@ -92,7 +92,12 @@
#include "ExpressionParser.h" #include "ExpressionParser.h"
#if defined(_MSC_VER)
#include <malloc.h> #include <malloc.h>
#else
#include <stdlib.h>
#endif
#include <cassert> #include <cassert>
#include <sstream> #include <sstream>
......
src/compiler/preprocessor/ExpressionParser.y
...@@ -33,7 +33,12 @@ WHICH GENERATES THE GLSL ES preprocessor expression parser. ...@@ -33,7 +33,12 @@ WHICH GENERATES THE GLSL ES preprocessor expression parser.
#include "ExpressionParser.h" #include "ExpressionParser.h"
#if defined(_MSC_VER)
#include <malloc.h> #include <malloc.h>
#else
#include <stdlib.h>
#endif
#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