summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Nolden <nolden@kde.org>2016-06-02 00:13:52 +0200
committerRalf Nolden <nolden@kde.org>2016-06-02 09:22:15 +0000
commit4c8efb407fa9ebfe3e1923970140cfe270fda75d (patch)
tree7f05dcd6e5287be7ae3120270d235ee12701d06c
parent76b5b0c3598a595c61f0cb274b392feeaf3e8dc3 (diff)
downloadqtscript-4c8efb407fa9ebfe3e1923970140cfe270fda75d.tar.gz
Compile Fix for OpenBSD in C++11 mode
Add a __cplusplus condition to an already existing OpenBSD defined part to activate the code only on older gcc compilers. See commit 32e0c5f96dac3f8afe187259929dd87012e1a464 in qtdeclarative. Change-Id: Ia7846f9058ee94bad160651347c128015e21698e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h
index 46b2241..f2517cd 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h
@@ -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 {