diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-09 19:24:32 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-09 19:24:32 (GMT) |
| commit | a9d73fb85226cc56c8089dfccef52eb22fe15585 (patch) | |
| tree | fbd8e99da26a6fb77b1ad49b2e360d5cccc60403 /src/3rdparty | |
| parent | 98445f62690278cd7343dbbf44d3cf2728a23a93 (diff) | |
| download | Qt-a9d73fb85226cc56c8089dfccef52eb22fe15585.zip Qt-a9d73fb85226cc56c8089dfccef52eb22fe15585.tar.gz Qt-a9d73fb85226cc56c8089dfccef52eb22fe15585.tar.bz2 | |
Fix compilation with aCC 6: this compiler has broken for scoping
"../3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp", line 860: error #2101: "size" has already been declared in the current scope
"../3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp", line 1560: error #2101: "span" has already been declared in the current scope
"../3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp", line 1807: error #2101: "s" has already been declared in the current scope
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp index 4305c23..f3ded7e 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp @@ -103,6 +103,11 @@ #define USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY 1 #endif +#if defined(__HP_aCC) +// HP'a aCC compiler has broken for scoping +# define for if(0){}else for +#endif + #ifndef NDEBUG namespace WTF { |