2006-05-09 Steve Falkenburg <sfalken@apple.com>
authorsfalken <sfalken@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 9 May 2006 21:50:12 +0000 (21:50 +0000)
committersfalken <sfalken@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 9 May 2006 21:50:12 +0000 (21:50 +0000)
        Fix Windows build.
        Minor fixes to WTF headers.

        Reviewed by kevin.

        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Fix include dirs, paths to files.
        * JavaScriptCore.vcproj/testkjs/testkjs.vcproj: Fix include dirs.
        * wtf/Assertions.h: include Platform.h to get definition for COMPILER()
        * wtf/Vector.h: include FastMalloc.h for definition of fastMalloc, fastFree

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@14263 268f45cc-cd09-0410-ab3c-d52691b4dbfc

JavaScriptCore/ChangeLog
JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
JavaScriptCore/JavaScriptCore.vcproj/testkjs/testkjs.vcproj
JavaScriptCore/wtf/Assertions.h
JavaScriptCore/wtf/Vector.h

index b1fcf359df2306dadb2c21c9263259f3d781ca2b..0e5456068759ff7fc30e8880dc5d5739977c6054 100644 (file)
@@ -1,3 +1,15 @@
+2006-05-09  Steve Falkenburg  <sfalken@apple.com>
+
+        Fix Windows build.
+        Minor fixes to WTF headers.
+        
+        Reviewed by kevin.
+
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Fix include dirs, paths to files. 
+        * JavaScriptCore.vcproj/testkjs/testkjs.vcproj: Fix include dirs.
+        * wtf/Assertions.h: include Platform.h to get definition for COMPILER()
+        * wtf/Vector.h: include FastMalloc.h for definition of fastMalloc, fastFree
+
 2006-05-09  Maciej Stachowiak  <mjs@apple.com>
 
         Rubber stamped by Anders.
index f1bb35a1ac338b2e7f31af7c399d2c5b84763dfa..c4f3994be9bd5768a67cf2ab2eba65417b53ec51 100644 (file)
@@ -46,7 +46,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions="&#x0D;&#x0A;"
                                Optimization="0"
-                               AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../kjs/;../../kxmlcore/;../../../icu/include"
+                               AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../kjs/;../../wtf/;../../../icu/include"
                                PreprocessorDefinitions="HAVE_CONFIG_H; WIN32; __STD_C"
                                MinimalRebuild="true"
                                ExceptionHandling="0"
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalOptions="&#x0D;&#x0A;"
-                               AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../kjs/;../../kxmlcore/;../../../icu/include"
+                               AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../kjs/;../../wtf/;../../../icu/include"
                                PreprocessorDefinitions="HAVE_CONFIG_H; WIN32; __STD_C;NDEBUG"
                                ExceptionHandling="0"
                                RuntimeLibrary="2"
                        </File>
                </Filter>
                <Filter
-                       Name="KXMLCore"
+                       Name="WTF"
                        >
                        <File
-                               RelativePath="..\..\kxmlcore\AlwaysInline.h"
+                               RelativePath="..\..\wtf\AlwaysInline.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\kxmlcore\Assertions.cpp"
+                               RelativePath="..\..\wtf\Assertions.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\kxmlcore\Assertions.h"
+                               RelativePath="..\..\wtf\Assertions.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\kxmlcore\FastMalloc.cpp"
+                               RelativePath="..\..\wtf\FastMalloc.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\kxmlcore\FastMalloc.h"
+                               RelativePath="..\..\wtf\FastMalloc.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\kxmlcore\FastMallocInternal.h"
+                               RelativePath="..\..\wtf\FastMallocInternal.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\kxmlcore\HashCountedSet.h"
+                               RelativePath="..\..\wtf\HashCountedSet.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\kxmlcore\HashFunctions.h"
+                               RelativePath="..\..\wtf\HashFunctions.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\kxmlcore\HashMap.h"
+                               RelativePath="..\..\wtf\HashMap.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\kxmlcore\HashSet.h"
+                               RelativePath="..\..\wtf\HashSet.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\kxmlcore\HashTable.cpp"
+                               RelativePath="..\..\wtf\HashTable.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\kxmlcore\HashTable.h"
+                               RelativePath="..\..\wtf\HashTable.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\kxmlcore\HashTraits.h"
+                               RelativePath="..\..\wtf\HashTraits.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\kxmlcore\PassRefPtr.h"
+                               RelativePath="..\..\wtf\PassRefPtr.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\kxmlcore\RefPtr.h"
+                               RelativePath="..\..\wtf\RefPtr.h"
                                >
                        </File>
                </Filter>
index 50027c5af0d5db0c776a96e92b675423e7dd7a00..b53aeef74d68925df0501d1b4469a570f79668d3 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../kjs/;../../kxmlcore/;../../../icu/include"
+                               AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../kjs/;../../wtf/;../../../icu/include"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE; WIN32"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../kjs/;../../kxmlcore/;../../../icu/include"
+                               AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../kjs/;../../wtf/;../../../icu/include"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE; WIN32"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
index 7f76ca47d4f79ff84006901af404cc49bb954464..8fe857d5bc491ab0c3c23f5167bac37c70107567 100644 (file)
@@ -35,6 +35,8 @@
 // For non-debug builds, everything is disabled by default.
 // Defining any of the symbols explicitly prevents this from having any effect.
 
+#include "Platform.h"
+
 #ifdef NDEBUG
 #define ASSERTIONS_DISABLED_DEFAULT 1
 #else
index 4dd90ceedb2ff2560c6e94c032f68b4847b9e09e..84a9205fb7b587a4e02d00a840b4be785c19bdcb 100644 (file)
@@ -24,6 +24,7 @@
 #define KXMLCORE_VECTOR_H
 
 #include "Assertions.h"
+#include "FastMalloc.h"
 #include "VectorTraits.h"
 #include <limits>
 #include <stdlib.h>