diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-28 12:51:49 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-28 12:51:49 +0200 |
| commit | 9461103e4e88d652adbcd1790a21f087a1fccc53 (patch) | |
| tree | 21c2df3684d2d6807344e480f9631871308049a6 /src/3rdparty/javascriptcore/JavaScriptCore | |
| parent | 6f00d966b8f1f12e4c41cf0a3e189718d10fd43f (diff) | |
| parent | b8845794b95376e8be39dbdafca2c85b5ec4c195 (diff) | |
| download | qtscript-9461103e4e88d652adbcd1790a21f087a1fccc53.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I0a8e242e0c24a67fe60737674dc3a4ecf0936f3a
Diffstat (limited to 'src/3rdparty/javascriptcore/JavaScriptCore')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp | 2 | ||||
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp index d5adbd7..1b2fd1d 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp @@ -559,7 +559,7 @@ static inline void *currentThreadStackBaseQNX() static pthread_t stackThread; pthread_t thread = pthread_self(); if (stackBase == 0 || thread != stackThread) { - struct _debug_thread_info threadInfo; + debug_thread_t threadInfo; memset(&threadInfo, 0, sizeof(threadInfo)); threadInfo.tid = pthread_self(); int fd = open("/proc/self", O_RDONLY); diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h index 46b2241..bf3cb53 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h @@ -40,7 +40,7 @@ #include <machine/ieee.h> #endif -#if OS(QNX) +#if (OS(QNX) && defined(_CPPLIB_VER)) || COMPILER(INTEL) // FIXME: Look into a way to have cmath import its functions into both the standard and global // namespace. For now, we include math.h since the QNX cmath header only imports its functions // into the standard namespace. @@ -95,7 +95,7 @@ inline bool isinf(double x) { return !finite(x) && !isnand(x); } #endif -#if OS(OPENBSD) +#if OS(OPENBSD) && __cplusplus < 201103L namespace std { |