c534ed02c3
Fixed moc-qt4 allows building qt-webkit again. Set the correct include paths for cross builds. Also use the same -std=gnu++98 which is used for qt itself.
20 lines
915 B
Diff
20 lines
915 B
Diff
--- qtwebkit-2.3.4/Source/WTF/wtf/SaturatedArithmetic.h 2014-09-24 13:42:05.000000000 +0200
|
|
+++ qtwebkit-2.3.4/Source/WTF/wtf/SaturatedArithmetic.h 2017-02-19 16:27:58.343676787 +0100
|
|
@@ -43,7 +43,7 @@
|
|
|
|
// Can only overflow if the signed bit of the two values match. If the signed
|
|
// bit of the result and one of the values differ it did overflow.
|
|
- if (!((ua ^ ub) >> 31) & (result ^ ua) >> 31)
|
|
+ if (~((ua ^ ub) >> 31) & ((result ^ ua) >> 31))
|
|
result = std::numeric_limits<int>::max() + (ua >> 31);
|
|
|
|
return result;
|
|
@@ -57,7 +57,7 @@
|
|
|
|
// Can only overflow if the signed bit of the two values do not match. If the
|
|
// signed bit of the result and the first value differ it did overflow.
|
|
- if ((ua ^ ub) >> 31 & (result ^ ua) >> 31)
|
|
+ if (((ua ^ ub) >> 31) & ((result ^ ua) >> 31))
|
|
result = std::numeric_limits<int>::max() + (ua >> 31);
|
|
|
|
return result;
|