[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[hausmann at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 4768485b359bf9167d255fbd9414bed62a7e4dc6
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Sep 12 18:08:07 2010 +0000

    Fix compilation of the V8 bindings on X11 with Qt.
    
    Reviewed by Andreas Kling.
    
    This changes brings the file in sync with its copy in bridge/,
    adding additional conflicting X11 keywords to undef. This is
    a temporary fix until the file is removed altogether, which is
    tracked in https://bugs.webkit.org/show_bug.cgi?id=45617
    
    * bindings/v8/npruntime_internal.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67331 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2cbab48..c873e31 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -17,6 +17,19 @@
 
         Fix compilation of the V8 bindings on X11 with Qt.
 
+        This changes brings the file in sync with its copy in bridge/,
+        adding additional conflicting X11 keywords to undef. This is
+        a temporary fix until the file is removed altogether, which is
+        tracked in https://bugs.webkit.org/show_bug.cgi?id=45617
+
+        * bindings/v8/npruntime_internal.h:
+
+2010-09-12  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        Fix compilation of the V8 bindings on X11 with Qt.
+
         These headers include npruntime, which drag on X11Resources.h, which
         among other things #define's None and Boolean. Later on v8.h is included,
         which declares these in enums and therefore conflicts. npruntime_internal.h
diff --git a/WebCore/bindings/v8/npruntime_internal.h b/WebCore/bindings/v8/npruntime_internal.h
index 75bf2b0..40d639f 100644
--- a/WebCore/bindings/v8/npruntime_internal.h
+++ b/WebCore/bindings/v8/npruntime_internal.h
@@ -38,4 +38,16 @@
     #undef Auto
     #undef Complex
     #undef Status
+    #undef CursorShape
+    #undef FocusIn
+    #undef FocusOut
+    #undef KeyPress
+    #undef KeyRelease
+    #undef Unsorted
+    #undef Bool
+    #undef FontChange
+    #undef GrayScale
+    #undef NormalState
+    #undef True
+    #undef False
 #endif

-- 
WebKit Debian packaging