commit b7b8a03c0d2f901dd2a39e614d67fb9f1d28d7bd
author eseidel <eseidel@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Tue Apr 04 18:10:12 2006 +0000
committer eseidel <eseidel@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Tue Apr 04 18:10:12 2006 +0000
tree 2abb9f1ae53425ebc3dabb5445ca81c9a041fd49
parent 44dd52ca4aca6378e385e57b8bff7e5438247cd7

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:


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

JavaScriptCore/kxmlcore/Assertions.h

diff --git a/JavaScriptCore/kxmlcore/Assertions.h b/JavaScriptCore/kxmlcore/Assertions.h
index 0b45020..d787d5a 100644
--- a/JavaScriptCore/kxmlcore/Assertions.h
+++ b/JavaScriptCore/kxmlcore/Assertions.h
@@ -98,6 +98,11 @@
 
 // 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)