2006-04-04 Eric Seidel <eseidel@apple.com>
authoreseidel <eseidel@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 4 Apr 2006 18:10:12 +0000 (18:10 +0000)
committereseidel <eseidel@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 4 Apr 2006 18:10:12 +0000 (18:10 +0000)
        Reviewed by ggaren.

        Fix win32 build.
        Disable ASSERT redefinition warnings for now.

        * JavaScriptCore.vcproj/testkjs/testkjs.vcproj:
        * kxmlcore/Assertions.h:

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

JavaScriptCore/ChangeLog
JavaScriptCore/JavaScriptCore.vcproj/testkjs/testkjs.vcproj
JavaScriptCore/kxmlcore/Assertions.h

index e5879f7233e0bcec2742ae1a4e60e6f804f6a06c..2e5fccb8468ed13583a757e3de2ab813d8edea3f 100644 (file)
@@ -1,3 +1,13 @@
+2006-04-04  Eric Seidel  <eseidel@apple.com>
+
+        Reviewed by ggaren.
+
+        Fix win32 build.
+        Disable ASSERT redefinition warnings for now.
+
+        * JavaScriptCore.vcproj/testkjs/testkjs.vcproj:
+        * kxmlcore/Assertions.h:
+
 2006-04-04  Bjrn Graf  <bjoern.graf@gmail.com>
 
         Reviewed by ggaren & darin.  Landed by eseidel.
index 9bd57e48796c87c468ed83296ddb82de9ca0e9e8..50027c5af0d5db0c776a96e92b675423e7dd7a00 100644 (file)
@@ -61,7 +61,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalOptions="&quot;$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\JavaScriptCore.lib&quot; ..\..\..\icu\lib\icuuc.lib"
+                               AdditionalOptions="&quot;$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\JavaScriptCore.lib&quot; ..\..\..\icu\lib\icuuc.lib&#x0D;&#x0A;winmm.lib"
                                LinkIncremental="2"
                                GenerateDebugInformation="true"
                                SubSystem="1"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalOptions="&quot;$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\JavaScriptCore.lib&quot; ..\..\..\icu\lib\icuuc.lib"
+                               AdditionalOptions="&quot;$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\JavaScriptCore.lib&quot; ..\..\..\icu\lib\icuuc.lib&#x0D;&#x0A;winmm.lib"
                                LinkIncremental="1"
                                GenerateDebugInformation="true"
                                SubSystem="1"
index 0b45020f65dde92415fa0d45f377c1bd7746465b..d787d5a92ec09b5ac860ef686b4a229dfc098ef2 100644 (file)
@@ -98,6 +98,11 @@ void KXCLog(const char *file, int line, const char *function, KXCLogChannel *cha
 
 // ASSERT, ASSERT_WITH_MESSAGE, ASSERT_NOT_REACHED
 
+#if PLATFORM(WIN_OS)
+// FIXME: Change to use something other than ASSERT to avoid this conflict with win32.
+#undef ASSERT
+#endif
+
 #if ASSERT_DISABLED
 
 #define ASSERT(assertion) ((void)0)