Changeset 27756 in webkit for trunk/JavaScriptCore

Timestamp:

Nov 13, 2007, 11:54:40 AM (18 years ago)

Author:

[email protected]

Message:

Windows build fix.

• bindings/c/c_utility.cpp: (KJS::Bindings::convertUTF8ToUTF16):
• kjs/ustring.cpp: (KJS::UString::UTF8String):
• wtf/unicode/UTF8.cpp: (WTF::Unicode::ConvertUTF8ToUTF16):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/c/c_utility.cpp (modified) (1 diff)
• kjs/ustring.cpp (modified) (1 diff)
• wtf/unicode/UTF8.cpp (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-11-13  Alexey Proskuryakov  <[email protected]>
+
+        Windows build fix.
+
+        * bindings/c/c_utility.cpp:
+        (KJS::Bindings::convertUTF8ToUTF16):
+        * kjs/ustring.cpp:
+        (KJS::UString::UTF8String):
+        * wtf/unicode/UTF8.cpp:
+        (WTF::Unicode::ConvertUTF8ToUTF16):
+
 2007-11-13  Darin Adler  <[email protected]>
 

trunk/JavaScriptCore/bindings/c/c_utility.cpp

@@ -72 +72 @@
     ConversionResult result = ConvertUTF8ToUTF16(&sourcestart, sourceend, &targetstart, targetend, true);
     
-    *UTF16Length = targetstart - *UTF16Chars;
+    *UTF16Length = targetstart - reinterpret_cast< ::UChar*>(*UTF16Chars);
 
     // Check to see if the conversion was successful

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -1282 +1282 @@
   // Convert to runs of 8-bit characters.
   char* p = buffer.data();
-  const ::UChar* d = &data()->uc;
+  const ::UChar* d = reinterpret_cast<const ::UChar*>(&data()->uc);
   ConversionResult result = ConvertUTF16ToUTF8(&d, d + length, &p, p + buffer.size(), strict);
   if (result != conversionOK)

trunk/JavaScriptCore/wtf/unicode/UTF8.cpp

@@ -118 +118 @@
 // (I.e., one byte sequence, two byte... etc.). Remember that sequencs
 // for *legal* UTF-8 will be 4 or fewer bytes total.
-static const char firstByteMark[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
+static const unsigned char firstByteMark[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
 
 ConversionResult ConvertUTF16ToUTF8(
@@ -240 +240 @@
     while (source < sourceEnd) {
         UChar32 ch = 0;
-        unsigned short extraBytesToRead = UTF8SequenceLength(*source) - 1;
+        int extraBytesToRead = UTF8SequenceLength(*source) - 1;
         if (source + extraBytesToRead >= sourceEnd) {
             result = sourceExhausted;