2006-08-31 Anders Carlsson <acarlsson@apple.com>

        Reviewed by Tim H.

        Fix Windows build.

        * JavaScriptCore.vcproj/dftables/dftables.vcproj:
        * pcre/pcre_internal.h:

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

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 07d6dfab812c53e303ab21a5da2f8dfe8bd6de3f..06ec89a79ca848e31e2edede48d5666cf2c8f462 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2006-08-31  Anders Carlsson  <acarlsson@apple.com>
+
+        Reviewed by Tim H.
+        
+        Fix Windows build.
+        
+        * JavaScriptCore.vcproj/dftables/dftables.vcproj:
+        * pcre/pcre_internal.h:
+
 2006-08-31  Timothy Hatcher  <timothy@apple.com>
 
         Reviewed by Geoff.

diff --git a/JavaScriptCore/JavaScriptCore.vcproj/dftables/dftables.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/dftables/dftables.vcproj
index 5e5636c92a5f9d2fefdb52650e0215cf188b7a60..87fd965195da90f9b53790247ec23dd15dfd052b 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.vcproj/dftables/dftables.vcproj
+++ b/JavaScriptCore/JavaScriptCore.vcproj/dftables/dftables.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
-       Version="8.00"
+       Version="8,00"
        Name="dftables"
        ProjectGUID="{BC2981C0-67A5-4A3C-879B-784BCBDE2541}"
        RootNamespace="dftables"
@@ -40,6 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
+                               AdditionalIncludeDirectories="../../wtf"
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"

diff --git a/JavaScriptCore/pcre/pcre_internal.h b/JavaScriptCore/pcre/pcre_internal.h
index c59ba6ffc357bce3ce8d90068bc0f95e135afeee..7985ac36c5630826dd8657f37da8d0b0014e47dd 100644 (file)
--- a/JavaScriptCore/pcre/pcre_internal.h
+++ b/JavaScriptCore/pcre/pcre_internal.h
@@ -43,7 +43,11 @@ POSSIBILITY OF SUCH DAMAGE.
 
 // Added to prevent 64-to-32 shortening warnings when compiling for 64-bit
 // <rdar://problem/4712064> PCRE generates many warnings with -Wshorten-64-to-32
+#if defined(__GNUC__) && defined(__LP64__)
 #define INT_CAST(i) (int)(i); ASSERT((i) <= INT_MAX)
+#else
+#define INT_CAST(i) (i)
+#endif
 
 /* This header contains definitions that are shared between the different
 modules, but which are not relevant to the exported API. This includes some