[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[ggaren at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 1e26ba56e237427f0fd56cccd560db2ee7c6c69a
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 3 21:01:12 2010 +0000

    Try to fix Windows build: Don't use GCActivityCallbackCF on Windows, since
    PLATFORM(CF) is not defined on Windows.
    
    We'll need to enable the GC activity callback some other way, but this
    change should get the build back to normal.
    
    * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
    
    * runtime/GCActivityCallbackCF.cpp: Make it easier to detect this error
    in the future with an explicit error message.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64587 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index e3088c0..148fc3d 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,18 @@
 2010-08-03  Geoffrey Garen  <ggaren at apple.com>
 
+        Try to fix Windows build: Don't use GCActivityCallbackCF on Windows, since
+        PLATFORM(CF) is not defined on Windows.
+        
+        We'll need to enable the GC activity callback some other way, but this
+        change should get the build back to normal.
+
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
+
+        * runtime/GCActivityCallbackCF.cpp: Make it easier to detect this error
+        in the future with an explicit error message.
+
+2010-08-03  Geoffrey Garen  <ggaren at apple.com>
+
         Try to fix Windows build: update .def file.
 
         * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
index c636687..1c37bc8 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
@@ -709,7 +709,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\runtime\GCActivityCallbackCF.cpp"
+				RelativePath="..\..\runtime\GCActivityCallback.cpp"
 				>
 			</File>
 			<File
diff --git a/JavaScriptCore/runtime/GCActivityCallbackCF.cpp b/JavaScriptCore/runtime/GCActivityCallbackCF.cpp
index aa92fc7..cfd07c7 100644
--- a/JavaScriptCore/runtime/GCActivityCallbackCF.cpp
+++ b/JavaScriptCore/runtime/GCActivityCallbackCF.cpp
@@ -31,10 +31,12 @@
 
 #include "Collector.h"
 #include "JSLock.h"
-
-#if PLATFORM(CF)
 #include <CoreFoundation/CoreFoundation.h>
 
+#if !PLATFORM(CF)
+#error "This file should only be used on CF platforms."
+#endif
+
 namespace JSC {
 
 struct DefaultGCActivityCallbackPlatformData {
@@ -78,5 +80,3 @@ void DefaultGCActivityCallback::operator()()
 }
 
 }
-
-#endif

-- 
WebKit Debian packaging