Patch by Lars Knoll, comment out ICU dependency on Qt platform (unused code).
authorstaikos <staikos@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 9 Dec 2006 22:40:10 +0000 (22:40 +0000)
committerstaikos <staikos@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 9 Dec 2006 22:40:10 +0000 (22:40 +0000)
        Reviewed by Darin.

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

JavaScriptCore/ChangeLog
JavaScriptCore/bindings/c/c_utility.cpp

index 1a2c661..4f75eb3 100644 (file)
@@ -1,3 +1,12 @@
+2006-12-09  George Staikos  <staikos@kde.org>
+
+        Patch by Lars Knoll, comment out ICU dependency on Qt platform (unused code).
+
+        Reviewed by Darin.
+
+        * bindings/c/c_utility.cpp:
+        (KJS::Bindings::convertUTF8ToUTF16):
+
 2006-12-08  David Hyatt  <hyatt@apple.com>
 
         Land the new ICU abstraction layer.  Patch by Lars.
index d708932..214422d 100644 (file)
 #include "npruntime_priv.h"
 #include "runtime_object.h"
 #include "runtime_root.h"
+#include "Platform.h"
+#if USE(ICU_UNICODE)
 #include <unicode/ucnv.h>
+#endif
 
 namespace KJS { namespace Bindings {
 
@@ -46,6 +49,7 @@ void convertNPStringToUTF16(const NPString *string, NPUTF16 **UTF16Chars, unsign
 // Requires free() of returned UTF16Chars.
 void convertUTF8ToUTF16(const NPUTF8 *UTF8Chars, int UTF8Length, NPUTF16 **UTF16Chars, unsigned int *UTF16Length)
 {
+#if USE(ICU_UNICODE)
     assert(UTF8Chars || UTF8Length == 0);
     assert(UTF16Chars);
     
@@ -80,6 +84,9 @@ void convertUTF8ToUTF16(const NPUTF8 *UTF8Chars, int UTF8Length, NPUTF16 **UTF16
         for (unsigned i = 0; i < *UTF16Length; i++)
             (*UTF16Chars)[i] = UTF8Chars[i] & 0xFF;
     }
+#else
+    assert(!"Implement me!");    
+#endif
 }
 
 // Variant value must be released with NPReleaseVariantValue()