[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[aroben at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit d7603a15c116e4a07ea8af2bed6d6f659dc99f22
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 7 16:49:35 2009 +0000

    Export DateInstance::info in a way that works on Windows
    
    Fixes <http://webkit.org/b/30171>
    fast/dom/Window/window-postmessage-clone.html fails on Windows
    
    Reviewed by Anders Carlsson.
    
    * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
    * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore_debug.def:
    Removed the export of DateInstance::info from here.
    
    * runtime/DateInstance.h: Use JS_EXPORTDATA to export
    DateInstance::info, which is the required way of exporting data on
    Windows.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49247 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 7734e70..8ecada8 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,20 @@
+2009-10-07  Adam Roben  <aroben at apple.com>
+
+        Export DateInstance::info in a way that works on Windows
+
+        Fixes <http://webkit.org/b/30171>
+        fast/dom/Window/window-postmessage-clone.html fails on Windows
+
+        Reviewed by Anders Carlsson.
+
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore_debug.def:
+        Removed the export of DateInstance::info from here.
+
+        * runtime/DateInstance.h: Use JS_EXPORTDATA to export
+        DateInstance::info, which is the required way of exporting data on
+        Windows.
+
 2009-10-07  Jørgen Lind  <jorgen.lind at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
index a3038c3..048613a 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
@@ -166,7 +166,6 @@ EXPORTS
     ?hasTransition at Structure@JSC@@QAE_NPAURep at UString@2 at I@Z
     ?heap at Heap@JSC@@SAPAV12 at VJSValue@2@@Z
     ?increment at RefCountedLeakCounter@WTF@@QAEXXZ
-    ?info at DateInstance@JSC@@2UClassInfo at 2@B
     ?init at JSGlobalObject@JSC@@AAEXPAVJSObject at 2@@Z
     ?initializeMainThread at WTF@@YAXXZ
     ?initializeThreading at JSC@@YAXXZ
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore_debug.def b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore_debug.def
index cb719b0..1f79502 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore_debug.def
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore_debug.def
@@ -166,7 +166,6 @@ EXPORTS
     ?hasTransition at Structure@JSC@@QAE_NPAURep at UString@2 at I@Z
     ?heap at Heap@JSC@@SAPAV12 at VJSValue@2@@Z
     ?increment at RefCountedLeakCounter@WTF@@QAEXXZ
-    ?info at DateInstance@JSC@@2UClassInfo at 2@B
     ?init at JSGlobalObject@JSC@@AAEXPAVJSObject at 2@@Z
     ?initializeMainThread at WTF@@YAXXZ
     ?initializeThreading at JSC@@YAXXZ
diff --git a/JavaScriptCore/runtime/DateInstance.h b/JavaScriptCore/runtime/DateInstance.h
index eecbb76..36d90b1 100644
--- a/JavaScriptCore/runtime/DateInstance.h
+++ b/JavaScriptCore/runtime/DateInstance.h
@@ -42,7 +42,7 @@ namespace JSC {
         bool getTime(double& milliseconds, int& offset) const;
         bool getUTCTime(double& milliseconds) const;
 
-        static const ClassInfo info;
+        static JS_EXPORTDATA const ClassInfo info;
 
         void msToGregorianDateTime(double, bool outputIsUTC, WTF::GregorianDateTime&) const;
 

-- 
WebKit Debian packaging