[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit ad9b326f3acad32671a0cd7c0e2bd37fbad428d8
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 24 10:12:36 2009 +0000

    On Windows JSChar is typedef'ed to wchar_t.
    
    Patch by Janne Koskinen <janne.p.koskinen at digia.com> on 2009-09-24
    Reviewed by Simon Hausmann.
    
    When building with WINSCW for Symbian we need to do the
    same typedef.
    
    * API/JSStringRef.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48711 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/API/JSStringRef.h b/JavaScriptCore/API/JSStringRef.h
index 8b17ee2..c58b958 100644
--- a/JavaScriptCore/API/JSStringRef.h
+++ b/JavaScriptCore/API/JSStringRef.h
@@ -37,7 +37,7 @@
 extern "C" {
 #endif
 
-#if !defined(WIN32) && !defined(_WIN32)
+#if !defined(WIN32) && !defined(_WIN32) && !defined(__WINSCW__)
 /*!
 @typedef JSChar
 @abstract A Unicode character.
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 4899919..d61f56c 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-09-24  Janne Koskinen  <janne.p.koskinen at digia.com>
+
+        Reviewed by Simon Hausmann.
+
+        On Windows JSChar is typedef'ed to wchar_t.
+
+        When building with WINSCW for Symbian we need to do the
+        same typedef.
+
+        * API/JSStringRef.h:
+
 2009-09-23  Geoffrey Garen  <ggaren at apple.com>
 
         A piece of my last patch that I forgot.

-- 
WebKit Debian packaging