pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
pkg/47354: pkgsrc/www/webkit-gtk : invalid conversion from 'signed char*' to 'int8_t* {aka char*}'
>Number: 47354
>Category: pkg
>Synopsis: pkgsrc/www/webkit-gtk : invalid conversion from 'signed char*'
>to 'int8_t* {aka char*}'
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: pkg-manager
>State: open
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Wed Dec 19 06:45:00 +0000 2012
>Originator: Richard PALO
>Release: pkgsrc trunk
>Organization:
>Environment:
SunOS devzoneX 5.11 oi_151a7 i86pc i386 i86pc Solaris
>Description:
after getting over a plethora of namespace problems involving std::isnan,
I am blocked by the following build error for www/webkit-gtk
CXX Source/JavaScriptCore/Programs_jsc_1-jsc.o
In file included from Source/JavaScriptCore/jsc.cpp:32:0:
Source/JavaScriptCore/JSCTypedArrayStubs.h: In member function 'void
JSC::JSInt8Array::finishCreation(JSC::JSGlobalData&)':
Source/JavaScriptCore/JSCTypedArrayStubs.h:194:1: error: invalid conversion
from 'signed char*' to 'int8_t* {aka char*}' [-fpermissive]
gmake[1]: *** [Source/JavaScriptCore/Programs_jsc_1-jsc.o] Error 1
gmake[1]: Leaving directory `/tmp/pkgsrc/www/webkit-gtk/work/webkitgtk-1.10.1'
gmake: *** [all] Error 2
*** Error code 2
Stop.
Can't seem to find this, and since building to this point takes over 24 hours
it is quite cumbersome to say the least.
>How-To-Repeat:
>Fix:
The patches to get over the namespace problems are below:
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/www/webkit-gtk/distinfo,v
retrieving revision 1.58
diff -u -p -r1.58 distinfo
--- distinfo 22 Nov 2012 18:20:48 -0000 1.58
+++ distinfo 19 Dec 2012 06:43:50 -0000
@@ -3,11 +3,38 @@ $NetBSD: distinfo,v 1.58 2012/11/22 18:2
SHA1 (webkitgtk-1.10.1.tar.xz) = 3a2df2eb42ffdd7f3b39873d5461c347a6330493
RMD160 (webkitgtk-1.10.1.tar.xz) = ea246d29a1def4993d592d8464b527b2c9ed1bdc
Size (webkitgtk-1.10.1.tar.xz) = 8548452 bytes
+SHA1 (patch-Source_JavaScriptCore_API_JSValueRef.cpp) =
869d27a7e2d0ee9a9085ee76ca50bd877e6bc2bc
+SHA1 (patch-Source_JavaScriptCore_JSCTypedArrayStubs.h) =
b2128186fc79f577599cc7a9d1396940faa1436b
SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) =
c5e1efdac5f6e2a4c035b6a3ce808d0e7a076703
+SHA1 (patch-Source_JavaScriptCore_runtime_DateConstructor.cpp) =
9fe693db24a592a33b5f405e771918deff3b8874
+SHA1 (patch-Source_JavaScriptCore_runtime_DateInstance.cpp) =
490bbc0f58704514e225c99a8d9c74530428f735
+SHA1 (patch-Source_JavaScriptCore_runtime_DatePrototype.cpp) =
2ae8dd33c8c3dd7d763c4b89b63dd90fd887663a
+SHA1 (patch-Source_JavaScriptCore_runtime_JSDateMath.cpp) =
1e3a970985df09a181636f27d0c615de120478cb
+SHA1 (patch-Source_JavaScriptCore_runtime_JSGlobalObjectFunctions.cpp) =
24c403fca235a62e9a3dacb5b5e71c9336436ff0
+SHA1 (patch-Source_JavaScriptCore_runtime_JSValue.cpp) =
126c56d3fcf7545676f5ddd84a594ee059bc873d
+SHA1 (patch-Source_JavaScriptCore_runtime_MathObject.cpp) =
ce8340a26c8c1771436ed9a46ac72dc996beb680
+SHA1 (patch-Source_JavaScriptCore_runtime_PropertyDescriptor.cpp) =
e0392b0d584e59ee7a91c21f614332d4121082a8
SHA1 (patch-Source_JavaScriptCore_wtf_Threading.h) =
f166335d829aba9051c1aaf1b950ec655deef372
SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) =
462e62d9078ef90df8cdeccbb64b0d2ccde5f11e
+SHA1 (patch-Source_WTF_wtf_DateMath.cpp) =
2dcb8192cbc4c3c535ca352471da6f2f7808f323
+SHA1 (patch-Source_WTF_wtf_IntegralTypedArrayBase.h) =
8f6c37e9f4c7ee19d93f7788e7340a69ad064d4e
+SHA1 (patch-Source_WTF_wtf_MathExtras.h) =
3325a999107779529612602d11bd263e758ef441
+SHA1 (patch-Source_WTF_wtf_Uint8ClampedArray.h) =
ada673a1f37c793f8f880a7fb5fefebb4cebfc9b
+SHA1 (patch-Source_WebCore_bindings_js_JSDataViewCustom.cpp) =
07ac95f80727d65fefb80a5880757df94668ef3f
+SHA1 (patch-Source_WebCore_bindings_js_JSHTMLOptionsCollectionCustom.cpp) =
62473644789e90735215b2499b536653bcb950f4
+SHA1 (patch-Source_WebCore_bindings_js_JSWebKitPointCustom.cpp) =
506bd0f5abc505b380a51b11999e5024760d48db
+SHA1 (patch-Source_WebCore_bindings_scripts_CodeGeneratorJS.pm) =
0659f4f3069c5eec6e98b3c8ef07486d301e20ee
+SHA1 (patch-Source_WebCore_css_WebKitCSSMatrix.cpp) =
dfbb46084ab716bf2c6c8804291d20f98569e09c
SHA1 (patch-Source_WebCore_editing_Editor.h) =
43562577dd6432a86fd8ee0a1e7bb0db31f07d2d
+SHA1 (patch-Source_WebCore_html_canvas_WebGLRenderingContext.cpp) =
97967599a89d33eeb6394c931223f1707eb270fb
+SHA1 (patch-Source_WebCore_page_DOMWindow.cpp) =
258b67f60f799be6dd2874a6a0b8e9a7860fa449
+SHA1 (patch-Source_WebCore_page_WindowFeatures.cpp) =
a1d51aa5a9b014965f986ede6c8804490bb42bb8
+SHA1 (patch-Source_WebCore_platform_CalculationValue.cpp) =
9f33573f9ff0909075e0ab6733455fb462481c81
+SHA1 (patch-Source_WebCore_platform_Length.cpp) =
b550225708f05068ed642f75c976f92841d02ba3
SHA1 (patch-Source_WebCore_platform_sql_SQLiteDatabase.cpp) =
0f33b188b242166584d5725060c5c430a819be61
+SHA1 (patch-Source_WebCore_svg_SVGSVGElement.cpp) =
0da2c0f80c583ee533bc8618fbd76c030f8b01e6
+SHA1 (patch-Source_WebCore_xml_XPathFunctions.cpp) =
170985923b207c7b567d0215cb877877e1b69f1e
+SHA1 (patch-Source_WebCore_xml_XPathValue.cpp) =
c04a705041c476e2a420f9a60c01b74eed1fd437
SHA1 (patch-ai) = 8df303ffde5c4398e56601c524e9ab4aff52096c
SHA1 (patch-aj) = 930d1b5d73028b2f2e5abb33c15f72befadc64ce
SHA1 (patch-ak) = 64ad843164f1c12968e933080e0966a9019abfdf
Index: patches/patch-Source_JavaScriptCore_API_JSValueRef.cpp
===================================================================
RCS file: patches/patch-Source_JavaScriptCore_API_JSValueRef.cpp
diff -N patches/patch-Source_JavaScriptCore_API_JSValueRef.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_JavaScriptCore_API_JSValueRef.cpp 19 Dec 2012
06:43:50 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- Source/JavaScriptCore/API/JSValueRef.cpp.orig 2012-10-16
15:22:38.000000000 +0000
++++ Source/JavaScriptCore/API/JSValueRef.cpp
+@@ -216,7 +216,7 @@ JSValueRef JSValueMakeNumber(JSContextRe
+ // Our JSValue representation relies on a standard bit pattern for NaN.
NaNs
+ // generated internally to JavaScriptCore naturally have that
representation,
+ // but an external NaN might not.
+- if (isnan(value))
++ if (std::isnan(value))
+ value = std::numeric_limits<double>::quiet_NaN();
+
+ return toRef(exec, jsNumber(value));
Index: patches/patch-Source_JavaScriptCore_JSCTypedArrayStubs.h
===================================================================
RCS file: patches/patch-Source_JavaScriptCore_JSCTypedArrayStubs.h
diff -N patches/patch-Source_JavaScriptCore_JSCTypedArrayStubs.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_JavaScriptCore_JSCTypedArrayStubs.h 19 Dec 2012
06:43:50 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- Source/JavaScriptCore/JSCTypedArrayStubs.h.orig 2012-10-16
15:22:38.000000000 +0000
++++ Source/JavaScriptCore/JSCTypedArrayStubs.h
+@@ -173,7 +173,7 @@ JSValue JS##name##Array::getByIndex(Exec
+ {\
+ ASSERT_GC_OBJECT_INHERITS(this, &s_info);\
+ type result = m_impl->item(index);\
+- if (isnan((double)result))\
++ if (std::isnan((double)result))\
+ return jsNaN();\
+ return JSValue(result);\
+ }\
Index: patches/patch-Source_JavaScriptCore_runtime_DateConstructor.cpp
===================================================================
RCS file: patches/patch-Source_JavaScriptCore_runtime_DateConstructor.cpp
diff -N patches/patch-Source_JavaScriptCore_runtime_DateConstructor.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_JavaScriptCore_runtime_DateConstructor.cpp 19 Dec
2012 06:43:50 -0000
@@ -0,0 +1,25 @@
+$NetBSD$
+
+--- Source/JavaScriptCore/runtime/DateConstructor.cpp.orig 2012-10-16
15:22:38.000000000 +0000
++++ Source/JavaScriptCore/runtime/DateConstructor.cpp
+@@ -199,13 +199,13 @@ static EncodedJSValue JSC_HOST_CALL date
+ exec->argument(6).toNumber(exec)
+ };
+ int n = exec->argumentCount();
+- if (isnan(doubleArguments[0])
+- || isnan(doubleArguments[1])
+- || (n >= 3 && isnan(doubleArguments[2]))
+- || (n >= 4 && isnan(doubleArguments[3]))
+- || (n >= 5 && isnan(doubleArguments[4]))
+- || (n >= 6 && isnan(doubleArguments[5]))
+- || (n >= 7 && isnan(doubleArguments[6])))
++ if (std::isnan(doubleArguments[0])
++ || std::isnan(doubleArguments[1])
++ || (n >= 3 && std::isnan(doubleArguments[2]))
++ || (n >= 4 && std::isnan(doubleArguments[3]))
++ || (n >= 5 && std::isnan(doubleArguments[4]))
++ || (n >= 6 && std::isnan(doubleArguments[5]))
++ || (n >= 7 && std::isnan(doubleArguments[6])))
+ return JSValue::encode(jsNaN());
+
+ GregorianDateTime t;
Index: patches/patch-Source_JavaScriptCore_runtime_DateInstance.cpp
===================================================================
RCS file: patches/patch-Source_JavaScriptCore_runtime_DateInstance.cpp
diff -N patches/patch-Source_JavaScriptCore_runtime_DateInstance.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_JavaScriptCore_runtime_DateInstance.cpp 19 Dec
2012 06:43:50 -0000
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- Source/JavaScriptCore/runtime/DateInstance.cpp.orig 2012-08-27
19:05:08.000000000 +0000
++++ Source/JavaScriptCore/runtime/DateInstance.cpp
+@@ -61,7 +61,7 @@ void DateInstance::destroy(JSCell* cell)
+ const GregorianDateTime* DateInstance::calculateGregorianDateTime(ExecState*
exec) const
+ {
+ double milli = internalNumber();
+- if (isnan(milli))
++ if (std::isnan(milli))
+ return 0;
+
+ if (!m_data)
+@@ -77,7 +77,7 @@ const GregorianDateTime* DateInstance::c
+ const GregorianDateTime*
DateInstance::calculateGregorianDateTimeUTC(ExecState* exec) const
+ {
+ double milli = internalNumber();
+- if (isnan(milli))
++ if (std::isnan(milli))
+ return 0;
+
+ if (!m_data)
Index: patches/patch-Source_JavaScriptCore_runtime_DatePrototype.cpp
===================================================================
RCS file: patches/patch-Source_JavaScriptCore_runtime_DatePrototype.cpp
diff -N patches/patch-Source_JavaScriptCore_runtime_DatePrototype.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_JavaScriptCore_runtime_DatePrototype.cpp 19 Dec
2012 06:43:50 -0000
@@ -0,0 +1,49 @@
+$NetBSD$
+
+--- Source/JavaScriptCore/runtime/DatePrototype.cpp.orig 2012-10-16
15:22:38.000000000 +0000
++++ Source/JavaScriptCore/runtime/DatePrototype.cpp
+@@ -829,7 +829,7 @@ EncodedJSValue JSC_HOST_CALL dateProtoFu
+
+ DateInstance* thisDateObj = asDateInstance(thisValue);
+ double milli = thisDateObj->internalNumber();
+- if (isnan(milli))
++ if (std::isnan(milli))
+ return JSValue::encode(jsNaN());
+
+ double secs = floor(milli / msPerSecond);
+@@ -845,7 +845,7 @@ EncodedJSValue JSC_HOST_CALL dateProtoFu
+
+ DateInstance* thisDateObj = asDateInstance(thisValue);
+ double milli = thisDateObj->internalNumber();
+- if (isnan(milli))
++ if (std::isnan(milli))
+ return JSValue::encode(jsNaN());
+
+ double secs = floor(milli / msPerSecond);
+@@ -890,7 +890,7 @@ static EncodedJSValue setNewValueFromTim
+ DateInstance* thisDateObj = asDateInstance(thisValue);
+ double milli = thisDateObj->internalNumber();
+
+- if (!exec->argumentCount() || isnan(milli)) {
++ if (!exec->argumentCount() || std::isnan(milli)) {
+ JSValue result = jsNaN();
+ thisDateObj->setInternalValue(exec->globalData(), result);
+ return JSValue::encode(result);
+@@ -935,7 +935,7 @@ static EncodedJSValue setNewValueFromDat
+ double ms = 0;
+
+ GregorianDateTime gregorianDateTime;
+- if (numArgsToUse == 3 && isnan(milli))
++ if (numArgsToUse == 3 && std::isnan(milli))
+ msToGregorianDateTime(exec, 0, true, gregorianDateTime);
+ else {
+ ms = milli - floor(milli / msPerSecond) * msPerSecond;
+@@ -1059,7 +1059,7 @@ EncodedJSValue JSC_HOST_CALL dateProtoFu
+ double ms = 0;
+
+ GregorianDateTime gregorianDateTime;
+- if (isnan(milli))
++ if (std::isnan(milli))
+ // Based on ECMA 262 B.2.5 (setYear)
+ // the time must be reset to +0 if it is NaN.
+ msToGregorianDateTime(exec, 0, true, gregorianDateTime);
Index: patches/patch-Source_JavaScriptCore_runtime_JSDateMath.cpp
===================================================================
RCS file: patches/patch-Source_JavaScriptCore_runtime_JSDateMath.cpp
diff -N patches/patch-Source_JavaScriptCore_runtime_JSDateMath.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_JavaScriptCore_runtime_JSDateMath.cpp 19 Dec 2012
06:43:50 -0000
@@ -0,0 +1,31 @@
+$NetBSD$
+
+--- Source/JavaScriptCore/runtime/JSDateMath.cpp.orig 2012-10-16
15:22:38.000000000 +0000
++++ Source/JavaScriptCore/runtime/JSDateMath.cpp
+@@ -195,7 +195,7 @@ static double getDSTOffset(ExecState* ex
+ double getUTCOffset(ExecState* exec)
+ {
+ double utcOffset = exec->globalData().cachedUTCOffset;
+- if (!isnan(utcOffset))
++ if (!std::isnan(utcOffset))
+ return utcOffset;
+ exec->globalData().cachedUTCOffset = calculateUTCOffset();
+ return exec->globalData().cachedUTCOffset;
+@@ -246,7 +246,7 @@ double parseDateFromNullTerminatedCharac
+ bool haveTZ;
+ int offset;
+ double ms = WTF::parseDateFromNullTerminatedCharacters(dateString,
haveTZ, offset);
+- if (isnan(ms))
++ if (std::isnan(ms))
+ return std::numeric_limits<double>::quiet_NaN();
+
+ // fall back to local timezone
+@@ -263,7 +263,7 @@ double parseDate(ExecState* exec, const
+ if (date == exec->globalData().cachedDateString)
+ return exec->globalData().cachedDateStringValue;
+ double value =
parseES5DateFromNullTerminatedCharacters(date.utf8().data());
+- if (isnan(value))
++ if (std::isnan(value))
+ value = parseDateFromNullTerminatedCharacters(exec,
date.utf8().data());
+ exec->globalData().cachedDateString = date;
+ exec->globalData().cachedDateStringValue = value;
Index: patches/patch-Source_JavaScriptCore_runtime_JSGlobalObjectFunctions.cpp
===================================================================
RCS file:
patches/patch-Source_JavaScriptCore_runtime_JSGlobalObjectFunctions.cpp
diff -N patches/patch-Source_JavaScriptCore_runtime_JSGlobalObjectFunctions.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_JavaScriptCore_runtime_JSGlobalObjectFunctions.cpp
19 Dec 2012 06:43:50 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp.orig
2012-10-16 15:22:38.000000000 +0000
++++ Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp
+@@ -562,7 +562,7 @@ EncodedJSValue JSC_HOST_CALL globalFuncP
+
+ EncodedJSValue JSC_HOST_CALL globalFuncIsNaN(ExecState* exec)
+ {
+- return
JSValue::encode(jsBoolean(isnan(exec->argument(0).toNumber(exec))));
++ return
JSValue::encode(jsBoolean(std::isnan(exec->argument(0).toNumber(exec))));
+ }
+
+ EncodedJSValue JSC_HOST_CALL globalFuncIsFinite(ExecState* exec)
Index: patches/patch-Source_JavaScriptCore_runtime_JSValue.cpp
===================================================================
RCS file: patches/patch-Source_JavaScriptCore_runtime_JSValue.cpp
diff -N patches/patch-Source_JavaScriptCore_runtime_JSValue.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_JavaScriptCore_runtime_JSValue.cpp 19 Dec 2012
06:43:50 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- Source/JavaScriptCore/runtime/JSValue.cpp.orig 2012-10-16
15:22:38.000000000 +0000
++++ Source/JavaScriptCore/runtime/JSValue.cpp
+@@ -45,7 +45,7 @@ double JSValue::toInteger(ExecState* exe
+ if (isInt32())
+ return asInt32();
+ double d = toNumber(exec);
+- return isnan(d) ? 0.0 : trunc(d);
++ return std::isnan(d) ? 0.0 : trunc(d);
+ }
+
+ double JSValue::toIntegerPreserveNaN(ExecState* exec) const
Index: patches/patch-Source_JavaScriptCore_runtime_MathObject.cpp
===================================================================
RCS file: patches/patch-Source_JavaScriptCore_runtime_MathObject.cpp
diff -N patches/patch-Source_JavaScriptCore_runtime_MathObject.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_JavaScriptCore_runtime_MathObject.cpp 19 Dec 2012
06:43:50 -0000
@@ -0,0 +1,31 @@
+$NetBSD$
+
+--- Source/JavaScriptCore/runtime/MathObject.cpp.orig 2012-10-16
15:22:38.000000000 +0000
++++ Source/JavaScriptCore/runtime/MathObject.cpp
+@@ -176,7 +176,7 @@ EncodedJSValue JSC_HOST_CALL mathProtoFu
+ double result = -std::numeric_limits<double>::infinity();
+ for (unsigned k = 0; k < argsCount; ++k) {
+ double val = exec->argument(k).toNumber(exec);
+- if (isnan(val)) {
++ if (std::isnan(val)) {
+ result = std::numeric_limits<double>::quiet_NaN();
+ break;
+ }
+@@ -192,7 +192,7 @@ EncodedJSValue JSC_HOST_CALL mathProtoFu
+ double result = +std::numeric_limits<double>::infinity();
+ for (unsigned k = 0; k < argsCount; ++k) {
+ double val = exec->argument(k).toNumber(exec);
+- if (isnan(val)) {
++ if (std::isnan(val)) {
+ result = std::numeric_limits<double>::quiet_NaN();
+ break;
+ }
+@@ -246,7 +246,7 @@ EncodedJSValue JSC_HOST_CALL mathProtoFu
+ double arg = exec->argument(0).toNumber(exec);
+ double arg2 = exec->argument(1).toNumber(exec);
+
+- if (isnan(arg2))
++ if (std::isnan(arg2))
+ return JSValue::encode(jsNaN());
+ if (isinf(arg2) && fabs(arg) == 1)
+ return JSValue::encode(jsNaN());
Index: patches/patch-Source_JavaScriptCore_runtime_PropertyDescriptor.cpp
===================================================================
RCS file: patches/patch-Source_JavaScriptCore_runtime_PropertyDescriptor.cpp
diff -N patches/patch-Source_JavaScriptCore_runtime_PropertyDescriptor.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_JavaScriptCore_runtime_PropertyDescriptor.cpp 19 Dec
2012 06:43:50 -0000
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- Source/JavaScriptCore/runtime/PropertyDescriptor.cpp.orig 2012-08-27
19:05:08.000000000 +0000
++++ Source/JavaScriptCore/runtime/PropertyDescriptor.cpp
+@@ -176,8 +176,8 @@ bool sameValue(ExecState* exec, JSValue
+ return false;
+ double x = a.asNumber();
+ double y = b.asNumber();
+- if (isnan(x))
+- return isnan(y);
++ if (std::isnan(x))
++ return std::isnan(y);
+ return bitwise_cast<uint64_t>(x) == bitwise_cast<uint64_t>(y);
+ }
+
Index: patches/patch-Source_WTF_wtf_DateMath.cpp
===================================================================
RCS file: patches/patch-Source_WTF_wtf_DateMath.cpp
diff -N patches/patch-Source_WTF_wtf_DateMath.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_WTF_wtf_DateMath.cpp 19 Dec 2012 06:43:50 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- Source/WTF/wtf/DateMath.cpp.orig 2012-10-16 15:22:38.000000000 +0000
++++ Source/WTF/wtf/DateMath.cpp
+@@ -1046,7 +1046,7 @@ double parseDateFromNullTerminatedCharac
+ bool haveTZ;
+ int offset;
+ double ms = parseDateFromNullTerminatedCharacters(dateString, haveTZ,
offset);
+- if (isnan(ms))
++ if (std::isnan(ms))
+ return std::numeric_limits<double>::quiet_NaN();
+
+ // fall back to local timezone
Index: patches/patch-Source_WTF_wtf_IntegralTypedArrayBase.h
===================================================================
RCS file: patches/patch-Source_WTF_wtf_IntegralTypedArrayBase.h
diff -N patches/patch-Source_WTF_wtf_IntegralTypedArrayBase.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_WTF_wtf_IntegralTypedArrayBase.h 19 Dec 2012
06:43:50 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- Source/WTF/wtf/IntegralTypedArrayBase.h.orig 2012-09-01
14:54:54.000000000 +0000
++++ Source/WTF/wtf/IntegralTypedArrayBase.h
+@@ -43,7 +43,7 @@ class IntegralTypedArrayBase : public Ty
+ {
+ if (index >= TypedArrayBase<T>::m_length)
+ return;
+- if (isnan(value)) // Clamp NaN to 0
++ if (std::isnan(value)) // Clamp NaN to 0
+ value = 0;
+ // The double cast is necessary to get the correct wrapping
+ // for out-of-range values with Int32Array and Uint32Array.
Index: patches/patch-Source_WTF_wtf_MathExtras.h
===================================================================
RCS file: patches/patch-Source_WTF_wtf_MathExtras.h
diff -N patches/patch-Source_WTF_wtf_MathExtras.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_WTF_wtf_MathExtras.h 19 Dec 2012 06:43:50 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- Source/WTF/wtf/MathExtras.h.orig 2012-10-16 15:22:38.000000000 +0000
++++ Source/WTF/wtf/MathExtras.h
+@@ -346,7 +346,7 @@ inline void decomposeDouble(double numbe
+ // Calculate d % 2^{64}.
+ inline void doubleToInteger(double d, unsigned long long& value)
+ {
+- if (isnan(d) || isinf(d))
++ if (std::isnan(d) || isinf(d))
+ value = 0;
+ else {
+ // -2^{64} < fmodValue < 2^{64}.
Index: patches/patch-Source_WTF_wtf_Uint8ClampedArray.h
===================================================================
RCS file: patches/patch-Source_WTF_wtf_Uint8ClampedArray.h
diff -N patches/patch-Source_WTF_wtf_Uint8ClampedArray.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_WTF_wtf_Uint8ClampedArray.h 19 Dec 2012 06:43:50
-0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- Source/WTF/wtf/Uint8ClampedArray.h.orig 2012-10-16 15:22:38.000000000
+0000
++++ Source/WTF/wtf/Uint8ClampedArray.h
+@@ -101,7 +101,7 @@ void Uint8ClampedArray::set(unsigned ind
+ {
+ if (index >= m_length)
+ return;
+- if (isnan(value) || value < 0)
++ if (std::isnan(value) || value < 0)
+ value = 0;
+ else if (value > 255)
+ value = 255;
Index: patches/patch-Source_WebCore_bindings_js_JSDataViewCustom.cpp
===================================================================
RCS file: patches/patch-Source_WebCore_bindings_js_JSDataViewCustom.cpp
diff -N patches/patch-Source_WebCore_bindings_js_JSDataViewCustom.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_WebCore_bindings_js_JSDataViewCustom.cpp 19 Dec
2012 06:43:50 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- Source/WebCore/bindings/js/JSDataViewCustom.cpp.orig 2012-10-16
15:22:38.000000000 +0000
++++ Source/WebCore/bindings/js/JSDataViewCustom.cpp
+@@ -89,7 +89,7 @@ static JSValue getDataViewMember(ExecSta
+ case AccessDataViewMemberAsFloat32:
+ case AccessDataViewMemberAsFloat64: {
+ double value = (type == AccessDataViewMemberAsFloat32) ?
imp->getFloat32(byteOffset, littleEndian, ec) : imp->getFloat64(byteOffset,
littleEndian, ec);
+- result = isnan(value) ? jsNaN() : jsNumber(value);
++ result = std::isnan(value) ? jsNaN() : jsNumber(value);
+ break;
+ } default:
+ ASSERT_NOT_REACHED();
Index:
patches/patch-Source_WebCore_bindings_js_JSHTMLOptionsCollectionCustom.cpp
===================================================================
RCS file:
patches/patch-Source_WebCore_bindings_js_JSHTMLOptionsCollectionCustom.cpp
diff -N
patches/patch-Source_WebCore_bindings_js_JSHTMLOptionsCollectionCustom.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_WebCore_bindings_js_JSHTMLOptionsCollectionCustom.cpp
19 Dec 2012 06:43:50 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- Source/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp.orig
2012-08-27 19:05:11.000000000 +0000
++++ Source/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp
+@@ -47,7 +47,7 @@ void JSHTMLOptionsCollection::setLength(
+ ExceptionCode ec = 0;
+ unsigned newLength = 0;
+ double lengthValue = value.toNumber(exec);
+- if (!isnan(lengthValue) && !isinf(lengthValue)) {
++ if (!std::isnan(lengthValue) && !isinf(lengthValue)) {
+ if (lengthValue < 0.0)
+ ec = INDEX_SIZE_ERR;
+ else if (lengthValue > static_cast<double>(UINT_MAX))
Index: patches/patch-Source_WebCore_bindings_js_JSWebKitPointCustom.cpp
===================================================================
RCS file: patches/patch-Source_WebCore_bindings_js_JSWebKitPointCustom.cpp
diff -N patches/patch-Source_WebCore_bindings_js_JSWebKitPointCustom.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_WebCore_bindings_js_JSWebKitPointCustom.cpp 19 Dec
2012 06:43:50 -0000
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- Source/WebCore/bindings/js/JSWebKitPointCustom.cpp.orig 2012-08-27
19:05:11.000000000 +0000
++++ Source/WebCore/bindings/js/JSWebKitPointCustom.cpp
+@@ -41,9 +41,9 @@ EncodedJSValue JSC_HOST_CALL JSWebKitPoi
+ if (exec->argumentCount() >= 2) {
+ x = static_cast<float>(exec->argument(0).toNumber(exec));
+ y = static_cast<float>(exec->argument(1).toNumber(exec));
+- if (isnan(x))
++ if (std::isnan(x))
+ x = 0;
+- if (isnan(y))
++ if (std::isnan(y))
+ y = 0;
+ }
+ return JSValue::encode(asObject(toJS(exec, jsConstructor->globalObject(),
WebKitPoint::create(x, y))));
Index: patches/patch-Source_WebCore_bindings_scripts_CodeGeneratorJS.pm
===================================================================
RCS file: patches/patch-Source_WebCore_bindings_scripts_CodeGeneratorJS.pm
diff -N patches/patch-Source_WebCore_bindings_scripts_CodeGeneratorJS.pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_WebCore_bindings_scripts_CodeGeneratorJS.pm 19 Dec
2012 06:43:50 -0000
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- Source/WebCore/bindings/scripts/CodeGeneratorJS.pm.orig 2012-10-16
15:22:38.000000000 +0000
++++ Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
+@@ -2340,7 +2340,7 @@ sub GenerateImplementation
+ push(@implContent, " ASSERT_GC_OBJECT_INHERITS(this, &s_info);\n");
+ push(@implContent, " double result =
static_cast<$implClassName*>(impl())->item(index);\n");
+ # jsNumber conversion doesn't suppress signalling NaNs, so enforce
that here.
+- push(@implContent, " if (isnan(result))\n");
++ push(@implContent, " if (std::isnan(result))\n");
+ push(@implContent, " return jsNaN();\n");
+ push(@implContent, " return JSValue(result);\n");
+ push(@implContent, "}\n\n");
+@@ -2614,7 +2614,7 @@ sub GenerateParametersCheck
+ push(@$outputArray, " double $nativeValue =
exec->argument($argsIndex).toNumber(exec);\n");
+ push(@$outputArray, " if (exec->hadException())\n");
+ push(@$outputArray, " return
JSValue::encode(jsUndefined());\n\n");
+- push(@$outputArray, " if (!isnan($nativeValue))\n");
++ push(@$outputArray, " if (!std::isnan($nativeValue))\n");
+ push(@$outputArray, " $name =
clampTo<$argType>($nativeValue);\n\n");
+ } else {
+ # If the "StrictTypeChecking" extended attribute is present, and
the argument's type is an
Index: patches/patch-Source_WebCore_css_WebKitCSSMatrix.cpp
===================================================================
RCS file: patches/patch-Source_WebCore_css_WebKitCSSMatrix.cpp
diff -N patches/patch-Source_WebCore_css_WebKitCSSMatrix.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_WebCore_css_WebKitCSSMatrix.cpp 19 Dec 2012
06:43:50 -0000
@@ -0,0 +1,89 @@
+$NetBSD$
+
+--- Source/WebCore/css/WebKitCSSMatrix.cpp.orig 2012-08-27
19:05:12.000000000 +0000
++++ Source/WebCore/css/WebKitCSSMatrix.cpp
+@@ -108,53 +108,53 @@ PassRefPtr<WebKitCSSMatrix> WebKitCSSMat
+
+ PassRefPtr<WebKitCSSMatrix> WebKitCSSMatrix::translate(double x, double y,
double z) const
+ {
+- if (isnan(x))
++ if (std::isnan(x))
+ x = 0;
+- if (isnan(y))
++ if (std::isnan(y))
+ y = 0;
+- if (isnan(z))
++ if (std::isnan(z))
+ z = 0;
+ return
WebKitCSSMatrix::create(TransformationMatrix(m_matrix).translate3d(x, y, z));
+ }
+
+ PassRefPtr<WebKitCSSMatrix> WebKitCSSMatrix::scale(double scaleX, double
scaleY, double scaleZ) const
+ {
+- if (isnan(scaleX))
++ if (std::isnan(scaleX))
+ scaleX = 1;
+- if (isnan(scaleY))
++ if (std::isnan(scaleY))
+ scaleY = scaleX;
+- if (isnan(scaleZ))
++ if (std::isnan(scaleZ))
+ scaleZ = 1;
+ return
WebKitCSSMatrix::create(TransformationMatrix(m_matrix).scale3d(scaleX, scaleY,
scaleZ));
+ }
+
+ PassRefPtr<WebKitCSSMatrix> WebKitCSSMatrix::rotate(double rotX, double rotY,
double rotZ) const
+ {
+- if (isnan(rotX))
++ if (std::isnan(rotX))
+ rotX = 0;
+
+- if (isnan(rotY) && isnan(rotZ)) {
++ if (std::isnan(rotY) && std::isnan(rotZ)) {
+ rotZ = rotX;
+ rotX = 0;
+ rotY = 0;
+ }
+
+- if (isnan(rotY))
++ if (std::isnan(rotY))
+ rotY = 0;
+- if (isnan(rotZ))
++ if (std::isnan(rotZ))
+ rotZ = 0;
+ return
WebKitCSSMatrix::create(TransformationMatrix(m_matrix).rotate3d(rotX, rotY,
rotZ));
+ }
+
+ PassRefPtr<WebKitCSSMatrix> WebKitCSSMatrix::rotateAxisAngle(double x, double
y, double z, double angle) const
+ {
+- if (isnan(x))
++ if (std::isnan(x))
+ x = 0;
+- if (isnan(y))
++ if (std::isnan(y))
+ y = 0;
+- if (isnan(z))
++ if (std::isnan(z))
+ z = 0;
+- if (isnan(angle))
++ if (std::isnan(angle))
+ angle = 0;
+ if (x == 0 && y == 0 && z == 0)
+ z = 1;
+@@ -163,14 +163,14 @@ PassRefPtr<WebKitCSSMatrix> WebKitCSSMat
+
+ PassRefPtr<WebKitCSSMatrix> WebKitCSSMatrix::skewX(double angle) const
+ {
+- if (isnan(angle))
++ if (std::isnan(angle))
+ angle = 0;
+ return
WebKitCSSMatrix::create(TransformationMatrix(m_matrix).skewX(angle));
+ }
+
+ PassRefPtr<WebKitCSSMatrix> WebKitCSSMatrix::skewY(double angle) const
+ {
+- if (isnan(angle))
++ if (std::isnan(angle))
+ angle = 0;
+ return
WebKitCSSMatrix::create(TransformationMatrix(m_matrix).skewY(angle));
+ }
Index: patches/patch-Source_WebCore_html_canvas_WebGLRenderingContext.cpp
===================================================================
RCS file: patches/patch-Source_WebCore_html_canvas_WebGLRenderingContext.cpp
diff -N patches/patch-Source_WebCore_html_canvas_WebGLRenderingContext.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_WebCore_html_canvas_WebGLRenderingContext.cpp 19 Dec
2012 06:43:50 -0000
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- Source/WebCore/html/canvas/WebGLRenderingContext.cpp.orig 2012-10-16
15:22:38.000000000 +0000
++++ Source/WebCore/html/canvas/WebGLRenderingContext.cpp
+@@ -1206,13 +1206,13 @@ void WebGLRenderingContext::clearColor(G
+ {
+ if (isContextLost())
+ return;
+- if (isnan(r))
++ if (std::isnan(r))
+ r = 0;
+- if (isnan(g))
++ if (std::isnan(g))
+ g = 0;
+- if (isnan(b))
++ if (std::isnan(b))
+ b = 0;
+- if (isnan(a))
++ if (std::isnan(a))
+ a = 1;
+ m_clearColor[0] = r;
+ m_clearColor[1] = g;
Index: patches/patch-Source_WebCore_page_DOMWindow.cpp
===================================================================
RCS file: patches/patch-Source_WebCore_page_DOMWindow.cpp
diff -N patches/patch-Source_WebCore_page_DOMWindow.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_WebCore_page_DOMWindow.cpp 19 Dec 2012 06:43:50
-0000
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- Source/WebCore/page/DOMWindow.cpp.orig 2012-10-16 15:22:39.000000000
+0000
++++ Source/WebCore/page/DOMWindow.cpp
+@@ -329,13 +329,13 @@ void DOMWindow::adjustWindowRect(const F
+ ASSERT(isfinite(window.height()));
+
+ // Update window values if new requested values are not NaN.
+- if (!isnan(pendingChanges.x()))
++ if (!std::isnan(pendingChanges.x()))
+ window.setX(pendingChanges.x());
+- if (!isnan(pendingChanges.y()))
++ if (!std::isnan(pendingChanges.y()))
+ window.setY(pendingChanges.y());
+- if (!isnan(pendingChanges.width()))
++ if (!std::isnan(pendingChanges.width()))
+ window.setWidth(pendingChanges.width());
+- if (!isnan(pendingChanges.height()))
++ if (!std::isnan(pendingChanges.height()))
+ window.setHeight(pendingChanges.height());
+
+ ASSERT(m_frame);
Index: patches/patch-Source_WebCore_page_WindowFeatures.cpp
===================================================================
RCS file: patches/patch-Source_WebCore_page_WindowFeatures.cpp
diff -N patches/patch-Source_WebCore_page_WindowFeatures.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_WebCore_page_WindowFeatures.cpp 19 Dec 2012
06:43:50 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- Source/WebCore/page/WindowFeatures.cpp.orig 2012-10-16
15:22:39.000000000 +0000
++++ Source/WebCore/page/WindowFeatures.cpp
+@@ -225,7 +225,7 @@ float WindowFeatures::floatFeature(const
+ // return the number 0 and false for ok. But "0q" should yield the
minimum rather than the default.
+ bool ok;
+ double parsedNumber = it->second.toDouble(&ok);
+- if ((parsedNumber == 0 && !ok) || isnan(parsedNumber))
++ if ((parsedNumber == 0 && !ok) || std::isnan(parsedNumber))
+ return defaultValue;
+ if (parsedNumber < min || max <= min)
+ return min;
Index: patches/patch-Source_WebCore_platform_CalculationValue.cpp
===================================================================
RCS file: patches/patch-Source_WebCore_platform_CalculationValue.cpp
diff -N patches/patch-Source_WebCore_platform_CalculationValue.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_WebCore_platform_CalculationValue.cpp 19 Dec 2012
06:43:50 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- Source/WebCore/platform/CalculationValue.cpp.orig 2012-08-27
19:05:14.000000000 +0000
++++ Source/WebCore/platform/CalculationValue.cpp
+@@ -65,7 +65,7 @@ float CalculationValue::evaluate(float m
+ float result = m_value->evaluate(maxValue);
+ // FIXME calc https://webkit.org/b/80411 : result is NaN when there is a
division
+ // by zero which isn't found at parse time.
+- if (isnan(result))
++ if (std::isnan(result))
+ return 0;
+ return m_isNonNegative && result < 0 ? 0 : result;
+ }
Index: patches/patch-Source_WebCore_platform_Length.cpp
===================================================================
RCS file: patches/patch-Source_WebCore_platform_Length.cpp
diff -N patches/patch-Source_WebCore_platform_Length.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_WebCore_platform_Length.cpp 19 Dec 2012 06:43:50
-0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- Source/WebCore/platform/Length.cpp.orig 2012-10-16 15:22:39.000000000
+0000
++++ Source/WebCore/platform/Length.cpp
+@@ -239,7 +239,7 @@ float Length::nonNanCalculatedValue(int
+ {
+ ASSERT(isCalculated());
+ float result = calculationValue()->evaluate(maxValue);
+- if (isnan(result))
++ if (std::isnan(result))
+ return 0;
+ return result;
+ }
Index: patches/patch-Source_WebCore_svg_SVGSVGElement.cpp
===================================================================
RCS file: patches/patch-Source_WebCore_svg_SVGSVGElement.cpp
diff -N patches/patch-Source_WebCore_svg_SVGSVGElement.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_WebCore_svg_SVGSVGElement.cpp 19 Dec 2012 06:43:50
-0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- Source/WebCore/svg/SVGSVGElement.cpp.orig 2012-10-16 15:22:39.000000000
+0000
++++ Source/WebCore/svg/SVGSVGElement.cpp
+@@ -517,7 +517,7 @@ float SVGSVGElement::getCurrentTime() co
+
+ void SVGSVGElement::setCurrentTime(float seconds)
+ {
+- if (isnan(seconds))
++ if (std::isnan(seconds))
+ return;
+ seconds = max(seconds, 0.0f);
+ m_timeContainer->setElapsed(seconds);
Index: patches/patch-Source_WebCore_xml_XPathFunctions.cpp
===================================================================
RCS file: patches/patch-Source_WebCore_xml_XPathFunctions.cpp
diff -N patches/patch-Source_WebCore_xml_XPathFunctions.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_WebCore_xml_XPathFunctions.cpp 19 Dec 2012 06:43:50
-0000
@@ -0,0 +1,30 @@
+$NetBSD$
+
+--- Source/WebCore/xml/XPathFunctions.cpp.orig 2012-10-16 15:22:39.000000000
+0000
++++ Source/WebCore/xml/XPathFunctions.cpp
+@@ -500,14 +500,14 @@ Value FunSubstring::evaluate() const
+ {
+ String s = arg(0)->evaluate().toString();
+ double doublePos = arg(1)->evaluate().toNumber();
+- if (isnan(doublePos))
++ if (std::isnan(doublePos))
+ return "";
+ long pos = static_cast<long>(FunRound::round(doublePos));
+ bool haveLength = argCount() == 3;
+ long len = -1;
+ if (haveLength) {
+ double doubleLen = arg(2)->evaluate().toNumber();
+- if (isnan(doubleLen))
++ if (std::isnan(doubleLen))
+ return "";
+ len = static_cast<long>(FunRound::round(doubleLen));
+ }
+@@ -659,7 +659,7 @@ Value FunCeiling::evaluate() const
+
+ double FunRound::round(double val)
+ {
+- if (!isnan(val) && !isinf(val)) {
++ if (!std::isnan(val) && !isinf(val)) {
+ if (signbit(val) && val >= -0.5)
+ val *= 0; // negative zero
+ else
Index: patches/patch-Source_WebCore_xml_XPathValue.cpp
===================================================================
RCS file: patches/patch-Source_WebCore_xml_XPathValue.cpp
diff -N patches/patch-Source_WebCore_xml_XPathValue.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_WebCore_xml_XPathValue.cpp 19 Dec 2012 06:43:50
-0000
@@ -0,0 +1,27 @@
+$NetBSD$
+
+--- Source/WebCore/xml/XPathValue.cpp.orig 2012-04-22 23:27:00.000000000
+0000
++++ Source/WebCore/xml/XPathValue.cpp
+@@ -74,7 +74,7 @@ bool Value::toBoolean() const
+ case BooleanValue:
+ return m_bool;
+ case NumberValue:
+- return m_number != 0 && !isnan(m_number);
++ return m_number != 0 && !std::isnan(m_number);
+ case StringValue:
+ return !m_data->m_string.isEmpty();
+ }
+@@ -123,11 +123,11 @@ String Value::toString() const
+ case StringValue:
+ return m_data->m_string;
+ case NumberValue:
+- if (isnan(m_number))
++ if (std::isnan(m_number))
+ return "NaN";
+ if (m_number == 0)
+ return "0";
+- if (isinf(m_number))
++ if (isinf(m_number))
+ return signbit(m_number) ? "-Infinity" : "Infinity";
+ return String::number(m_number);
+ case BooleanValue:
Home |
Main Index |
Thread Index |
Old Index