| commit | a738f085a9d1ce14d7154b679f4600f2f80e846b | [log] [tgz] |
|---|---|---|
| author | Jamie Madill <jmadill@chromium.org> | Fri Nov 01 17:45:04 2013 -0400 |
| committer | Shannon Woods <shannonwoods@chromium.org> | Mon Dec 09 21:54:57 2013 +0000 |
| tree | 847bee921bf0abea932f7aa430942d9de19d7e8b | |
| parent | d7f2135fcc5b3cbe0a50205fb07159cd97c66886 [diff] [blame] |
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/178993 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 9603274..9d8cc42 100644 --- a/src/compiler/preprocessor/ExpressionParser.cpp +++ b/src/compiler/preprocessor/ExpressionParser.cpp
@@ -92,7 +92,12 @@ #include "ExpressionParser.h" +#if defined(_MSC_VER) #include <malloc.h> +#else +#include <stdlib.h> +#endif + #include <cassert> #include <sstream>