diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2014-04-18 17:37:49 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-22 12:46:32 (GMT) |
| commit | dfb80318cdd574205e6dd7780ad7688d7786da87 (patch) | |
| tree | c44b0f2b407bddf42b6db74aff2a0381163ab0df /src/3rdparty | |
| parent | b952502b2af4c8760f7753d7eeadbd82e4290453 (diff) | |
| download | Qt-dfb80318cdd574205e6dd7780ad7688d7786da87.zip Qt-dfb80318cdd574205e6dd7780ad7688d7786da87.tar.gz Qt-dfb80318cdd574205e6dd7780ad7688d7786da87.tar.bz2 | |
Fix building of JSC with libc++.
Follow-up to 0de22e8 and 427d50d: the former was not just a cleanup
commit, and part of the changes reverted in the latter actually broke
the build with libc++ again: clang defines __GNUC__ for compatibility
with GCC, but if libc++ is used ext/atomicity.h does not exist.
Change-Id: Id86646d38b7bc62dbe0731f8f32efb2353335210
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h index 9b49db3..bf190a8 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h @@ -77,12 +77,6 @@ #include <cutils/atomic.h> #elif OS(QNX) #include <atomic.h> -#elif COMPILER(GCC) && !OS(SYMBIAN) -#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) -#include <ext/atomicity.h> -#else -#include <bits/atomicity.h> -#endif #endif #if USE(PTHREADS) |