Try to fix Windows build: Don't use GCActivityCallbackCF on Windows, since
authorggaren@apple.com <ggaren@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Aug 2010 21:01:12 +0000 (21:01 +0000)
committerggaren@apple.com <ggaren@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Aug 2010 21:01:12 +0000 (21:01 +0000)
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: https://svn.webkit.org/repository/webkit/trunk@64587 268f45cc-cd09-0410-ab3c-d52691b4dbfc

JavaScriptCore/ChangeLog
JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
JavaScriptCore/runtime/GCActivityCallbackCF.cpp

index e3088c0..148fc3d 100644 (file)
@@ -1,5 +1,18 @@
 2010-08-03  Geoffrey Garen  <ggaren@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@apple.com>
+
         Try to fix Windows build: update .def file.
 
         * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
index c636687..1c37bc8 100644 (file)
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\runtime\GCActivityCallbackCF.cpp"\r
+                               RelativePath="..\..\runtime\GCActivityCallback.cpp"\r
                                >\r
                        </File>\r
                        <File\r
index aa92fc7..cfd07c7 100644 (file)
 
 #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