Title: [86916] branches/safari-534.36-branch/Source/_javascript_Core
Diff
Modified: branches/safari-534.36-branch/Source/_javascript_Core/ChangeLog (86915 => 86916)
--- branches/safari-534.36-branch/Source/_javascript_Core/ChangeLog 2011-05-20 01:13:38 UTC (rev 86915)
+++ branches/safari-534.36-branch/Source/_javascript_Core/ChangeLog 2011-05-20 01:16:24 UTC (rev 86916)
@@ -1,5 +1,19 @@
2011-05-19 Lucas Forschler <[email protected]
+ Merged r86850.
+
+ 2011-05-19 Adam Roben <[email protected]>
+
+ Remove a redundant and broken data export
+
+ Data can't be exported from _javascript_Core.dll by listing it in the .def file. The
+ JS_EXPORTDATA macro must be used instead. (In this case it was already being used, leading
+ to a linker warning about multiple definitions.)
+
+ * _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def: Removed JSGlobalData::s_info.
+
+2011-05-19 Lucas Forschler <[email protected]
+
Merged r86809.
2011-05-18 Oliver Hunt <[email protected]>
Modified: branches/safari-534.36-branch/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def (86915 => 86916)
--- branches/safari-534.36-branch/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def 2011-05-20 01:13:38 UTC (rev 86915)
+++ branches/safari-534.36-branch/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def 2011-05-20 01:16:24 UTC (rev 86916)
@@ -296,7 +296,6 @@
?restoreAll@Profile@JSC@@QAEXXZ
?retrieveCaller@Interpreter@JSC@@QBE?AVJSValue@2@PAVExecState@2@PAVJSFunction@2@@Z
?retrieveLastCaller@Interpreter@JSC@@QBEXPAVExecState@2@AAH1AAVUString@2@AAVJSValue@2@@Z
- ?s_info@JSGlobalObject@JSC@@2UClassInfo@2@B
?setAccessorDescriptor@PropertyDescriptor@JSC@@QAEXVJSValue@2@0I@Z
?setConfigurable@PropertyDescriptor@JSC@@QAEX_N@Z
?setDescriptor@PropertyDescriptor@JSC@@QAEXVJSValue@2@I@Z
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
