[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 c2f4e429c974f79ae6c43c84482dccea1ce49282
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Sep 12 16:57:06 2010 +0000

    Fix compilation of the V8 bindings on X11 with Qt.
    
    Reviewed by Andreas Kling.
    
    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
    was introduced exactly to address this problem by including npruntime.h
    and undeff'ing the offending constants.
    
    * bindings/v8/V8Helpers.h:
    * bindings/v8/V8NPObject.h:
    * bindings/v8/V8NPUtils.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67329 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6b707cd..d00ba0f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,21 @@
 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
+        was introduced exactly to address this problem by including npruntime.h
+        and undeff'ing the offending constants.
+
+        * bindings/v8/V8Helpers.h:
+        * bindings/v8/V8NPObject.h:
+        * bindings/v8/V8NPUtils.h:
+
+2010-09-12  Simon Hausmann  <simon.hausmann at nokia.com>
+
         Gtk build fix.
 
         Use false instead of False after
diff --git a/WebCore/bindings/v8/V8Helpers.h b/WebCore/bindings/v8/V8Helpers.h
index e90f5d6..43d765a 100644
--- a/WebCore/bindings/v8/V8Helpers.h
+++ b/WebCore/bindings/v8/V8Helpers.h
@@ -31,7 +31,7 @@
 #ifndef V8Helpers_h
 #define V8Helpers_h
 
-#include "npruntime.h"
+#include "npruntime_internal.h"
 #include <v8.h>
 
 namespace WebCore {
diff --git a/WebCore/bindings/v8/V8NPObject.h b/WebCore/bindings/v8/V8NPObject.h
index a540ca9..832d649 100644
--- a/WebCore/bindings/v8/V8NPObject.h
+++ b/WebCore/bindings/v8/V8NPObject.h
@@ -34,7 +34,7 @@
 #if PLATFORM(CHROMIUM)
 #include <bindings/npruntime.h>
 #else
-#include "npruntime.h"
+#include "npruntime_internal.h"
 #endif
 
 #include <v8.h>
diff --git a/WebCore/bindings/v8/V8NPUtils.h b/WebCore/bindings/v8/V8NPUtils.h
index 78414b4..dc6185b 100644
--- a/WebCore/bindings/v8/V8NPUtils.h
+++ b/WebCore/bindings/v8/V8NPUtils.h
@@ -33,7 +33,7 @@
 #if PLATFORM(CHROMIUM)
 #include <bindings/npruntime.h>
 #else
-#include "npruntime.h"
+#include "npruntime_internal.h"
 #endif
 
 #include <v8.h>

-- 
WebKit Debian packaging