Changeset 44765 in webkit for trunk/JavaScriptCore/wtf

Timestamp:

Jun 17, 2009, 9:39:56 AM (16 years ago)

Author:

[email protected]

Message:

2009-06-17 George Staikos <​[email protected]>

Reviewed by Adam Treat.

​https://bugs.webkit.org/show_bug.cgi?id=23155
Move WIN_CE -> WINCE as previously discussed with Qt WINCE folks.

Location:

trunk/JavaScriptCore/wtf

Files:

• Assertions.cpp (modified) (2 diffs)
• Assertions.h (modified) (1 diff)
• CurrentTime.cpp (modified) (2 diffs)
• DateMath.cpp (modified) (1 diff)
• MathExtras.h (modified) (1 diff)
• Platform.h (modified) (3 diffs)
• StringExtras.h (modified) (2 diffs)
• Threading.h (modified) (3 diffs)
• win/MainThreadWin.cpp (modified) (1 diff)

trunk/JavaScriptCore/wtf/Assertions.cpp

@@ -35 +35 @@
 #endif
 
-#if COMPILER(MSVC) && !PLATFORM(WIN_CE)
+#if COMPILER(MSVC) && !PLATFORM(WINCE)
 #ifndef WINVER
 #define WINVER 0x0500
@@ -67 +67 @@
         CFRelease(cfFormat);
     } else
-#elif COMPILER(MSVC) && !PLATFORM(WIN_CE)
+#elif COMPILER(MSVC) && !PLATFORM(WINCE)
     if (IsDebuggerPresent()) {
         size_t size = 1024;

trunk/JavaScriptCore/wtf/Assertions.h

@@ -129 +129 @@
 /* ASSERT, ASSERT_WITH_MESSAGE, ASSERT_NOT_REACHED */
 
-#if PLATFORM(WIN_CE)
+#if PLATFORM(WINCE) && !PLATFORM(TORCHMOBILE)
 /* FIXME: We include this here only to avoid a conflict with the ASSERT macro. */
 #include <windows.h>

trunk/JavaScriptCore/wtf/CurrentTime.cpp

@@ -108 +108 @@
 static double lowResUTCTime()
 {
-#if PLATFORM(WIN_CE)
+#if PLATFORM(WINCE)
     SYSTEMTIME systemTime;
     GetSystemTime(&systemTime);
@@ -121 +121 @@
     time_t timet = mktime(&tmtime);
     return timet * msPerSecond + systemTime.wMilliseconds;
-#else // PLATFORM(WIN_CE)
+#else
     struct _timeb timebuffer;
     _ftime(&timebuffer);
     return timebuffer.time * msPerSecond + timebuffer.millitm;
-#endif // PLATFORM(WIN_CE)
+#endif
 }
 

trunk/JavaScriptCore/wtf/DateMath.cpp

@@ -301 +301 @@
 void getLocalTime(const time_t* localTime, struct tm* localTM)
 {
-#if COMPILER(MSVC7) || COMPILER(MINGW) || PLATFORM(WIN_CE)
+#if COMPILER(MSVC7) || COMPILER(MINGW) || PLATFORM(WINCE)
     *localTM = *localtime(localTime);
 #elif COMPILER(MSVC)

trunk/JavaScriptCore/wtf/MathExtras.h

@@ -40 +40 @@
 
 #if COMPILER(MSVC)
-#if PLATFORM(WIN_CE)
+#if PLATFORM(WINCE)
 #include <stdlib.h>
 #endif

trunk/JavaScriptCore/wtf/Platform.h

@@ -57 +57 @@
 #endif
 
-/* PLATFORM(WIN_CE) */
+/* PLATFORM(WINCE) */
 /* Operating system level dependencies for Windows CE that should be used */
 /* regardless of operating environment */
 /* Note that for this platform PLATFORM(WIN_OS) is also defined. */
 #if defined(_WIN32_WCE)
-#define WTF_PLATFORM_WIN_CE 1
+#define WTF_PLATFORM_WINCE 1
 #endif
 
@@ -259 +259 @@
 #endif
 
-/* PLATFORM(WIN_CE) && PLATFORM(QT)
+/* PLATFORM(WINCE) && PLATFORM(QT)
    We can not determine the endianess at compile time. For
    Qt for Windows CE the endianess is specified in the
    device specific makespec
 */
-#if PLATFORM(WIN_CE) && PLATFORM(QT)
+#if PLATFORM(WINCE) && PLATFORM(QT)
 #   include <QtGlobal>
 #   undef WTF_PLATFORM_BIG_ENDIAN
@@ -407 +407 @@
 
 #define HAVE_FLOAT_H 1
-#if PLATFORM(WIN_CE)
+#if PLATFORM(WINCE)
 #define HAVE_ERRNO_H 0
 #else

trunk/JavaScriptCore/wtf/StringExtras.h

@@ -46 +46 @@
 }
 
-#if COMPILER(MSVC7) || PLATFORM(WIN_CE)
+#if COMPILER(MSVC7) || PLATFORM(WINCE)
 
 inline int vsnprintf(char* buffer, size_t count, const char* format, va_list args)
@@ -55 +55 @@
 #endif
 
-#if PLATFORM(WIN_CE)
+#if PLATFORM(WINCE)
 
 inline int strnicmp(const char* string1, const char* string2, size_t count)

trunk/JavaScriptCore/wtf/Threading.h

@@ -60 +60 @@
 #define Threading_h
 
-#if PLATFORM(WIN_CE)
+#if PLATFORM(WINCE)
 #include <windows.h>
 #endif
@@ -68 +68 @@
 #include <wtf/Noncopyable.h>
 
-#if PLATFORM(WIN_OS) && !PLATFORM(WIN_CE)
+#if PLATFORM(WIN_OS) && !PLATFORM(WINCE)
 #include <windows.h>
 #elif PLATFORM(DARWIN)
@@ -213 +213 @@
 #define WTF_USE_LOCKFREE_THREADSAFESHARED 1
 
-#if COMPILER(MINGW) || COMPILER(MSVC7) || PLATFORM(WIN_CE)
+#if COMPILER(MINGW) || COMPILER(MSVC7) || PLATFORM(WINCE)
 inline void atomicIncrement(int* addend) { InterlockedIncrement(reinterpret_cast<long*>(addend)); }
 inline int atomicDecrement(int* addend) { return InterlockedDecrement(reinterpret_cast<long*>(addend)); }

trunk/JavaScriptCore/wtf/win/MainThreadWin.cpp

@@ -32 +32 @@
 #include "Assertions.h"
 #include "Threading.h"
-#if !PLATFORM(WIN_CE)
+#if !PLATFORM(WINCE)
 #include <windows.h>
 #endif