зеркало из https://github.com/AvaloniaUI/angle.git
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>
This commit is contained in:
Родитель
827a471b74
Коммит
d7f2135fcc
1
AUTHORS
1
AUTHORS
|
@ -13,6 +13,7 @@ TransGaming Inc.
|
|||
|
||||
Adobe Systems Inc.
|
||||
Autodesk, Inc.
|
||||
BlackBerry Limited
|
||||
Cloud Party, Inc.
|
||||
Intel Corporation
|
||||
Mozilla Corporation
|
||||
|
|
|
@ -92,6 +92,7 @@
|
|||
|
||||
#include "ExpressionParser.h"
|
||||
|
||||
#include <malloc.h>
|
||||
#include <cassert>
|
||||
#include <sstream>
|
||||
|
||||
|
|
|
@ -33,6 +33,7 @@ WHICH GENERATES THE GLSL ES preprocessor expression parser.
|
|||
|
||||
#include "ExpressionParser.h"
|
||||
|
||||
#include <malloc.h>
|
||||
#include <cassert>
|
||||
#include <sstream>
|
||||
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
#define _INFOSINK_INCLUDED_
|
||||
|
||||
#include <math.h>
|
||||
#include <stdlib.h>
|
||||
#include "compiler/translator/Common.h"
|
||||
|
||||
// Returns the fractional part of the given floating-point number.
|
||||
|
|
Загрузка…
Ссылка в новой задаче