Changeset 24774 in webkit for trunk/JavaScriptCore

Timestamp:

Jul 30, 2007, 8:30:37 AM (18 years ago)

Author:

hausmann

Message:

Removed the BUILDING_QT ifdef in JSStringRef.h and changed UChar for the Qt build to use wchar_t on Windows.

Location:

trunk/JavaScriptCore

Files:

• API/JSStringRef.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• wtf/unicode/qt4/UnicodeQt4.h (modified) (1 diff)

trunk/JavaScriptCore/API/JSStringRef.h

@@ -41 +41 @@
 @abstract A Unicode character.
 */
-#if (!defined(WIN32) && !defined(_WIN32)) || defined(__BUILDING_QT)
+#if !defined(WIN32) && !defined(_WIN32)
     typedef unsigned short JSChar;
 #else

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-07-30  Simon Hausmann  <[email protected]>
+
+        Done with and reviewed by Lars.
+
+        Removed the __BUILDING_QT ifdef in JSStringRef.h and changed UChar for the Qt build to use wchar_t on Windows.
+
+        * API/JSStringRef.h:
+        * wtf/unicode/qt4/UnicodeQt4.h:
+
 2007-07-27  Simon Hausmann  <[email protected]>
 

trunk/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h

@@ -56 +56 @@
 #endif
 
+// ugly hack to make UChar compatible with JSChar in API/JSStringRef.h
+#if defined(Q_OS_WIN)
+typedef wchar_t UChar;
+#else
 typedef uint16_t UChar;
+#endif
 typedef uint32_t UChar32;