Changeset 38699 in webkit for trunk/JavaScriptCore/wtf/Assertions.h

Timestamp:

Nov 24, 2008, 12:09:56 AM (17 years ago)

Author:

Simon Hausmann

Message:

2008-11-24 Joerg Bornemann <​[email protected]>

Reviewed by Simon Hausmann.

​https://bugs.webkit.org/show_bug.cgi?id=20746

Various small compilation fixes to make the Qt port of WebKit
compile on Windows CE.

• config.h: Don't set _CRT_RAND_S for CE, it's not available.
• jsc.cpp: Disabled use of debugger includes for CE. It does not have the debugging functions.
• runtime/DateMath.cpp: Use localtime() on Windows CE.
• wtf/Assertions.cpp: Compile on Windows CE without debugger.
• wtf/Assertions.h: Include windows.h before defining ASSERT.
• wtf/MathExtras.h: Include stdlib.h instead of xmath.h.
• wtf/Platform.h: Disable ERRNO_H and detect endianess based on the Qt endianess. On Qt for Windows CE the endianess is defined by the vendor specific build spec.
• wtf/Threading.h: Use the volatile-less atomic functions.
• wtf/dtoa.cpp: Compile without errno.
• wtf/win/MainThreadWin.cpp: Don't include windows.h on CE after Assertions.h due to the redefinition of ASSERT.

File:

• trunk/JavaScriptCore/wtf/Assertions.h (modified) (1 diff)

trunk/JavaScriptCore/wtf/Assertions.h

@@ -129 +129 @@
 /* ASSERT, ASSERT_WITH_MESSAGE, ASSERT_NOT_REACHED */
 
+#if PLATFORM(WIN_CE)
+/* FIXME: We include this here only to avoid a conflict with the ASSERT macro. */
+#include <windows.h>
+#undef min
+#undef max
+#undef ERROR
+#endif
+
 #if PLATFORM(WIN_OS)
 /* FIXME: Change to use something other than ASSERT to avoid this conflict with win32. */