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

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 14:38:42 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 7a72935948c7cc01cb31157d9c711e6f9c71cc03
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 14 19:22:38 2010 +0000

    2010-10-14  Dawit Alemayehu  <adawit at kde.org>
    
            Reviewed by Andreas Kling.
    
            Fix compile error when bulding webkit's Qt port using the "--v8" option.
            https://bugs.webkit.org/show_bug.cgi?id=47455
    
            * platform/qt/PlatformBridge.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69791 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 199850b..d051cb9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-14  Dawit Alemayehu  <adawit at kde.org>
+
+        Reviewed by Andreas Kling.
+
+        Fix compile error when bulding webkit's Qt port using the "--v8" option.
+        https://bugs.webkit.org/show_bug.cgi?id=47455
+
+        * platform/qt/PlatformBridge.h:
+
 2010-10-01  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Holger Freyther.
diff --git a/WebCore/platform/qt/PlatformBridge.h b/WebCore/platform/qt/PlatformBridge.h
index 918e139..e478d8f 100644
--- a/WebCore/platform/qt/PlatformBridge.h
+++ b/WebCore/platform/qt/PlatformBridge.h
@@ -27,7 +27,6 @@
 #define PlatformBridge_h
 
 #include "KURL.h"
-#include "npapi.h"
 #include "PlatformString.h"
 
 #include <wtf/Vector.h>
@@ -77,7 +76,9 @@
    static_cast<size_t>(!(sizeof(a) % sizeof(*(a)))))
 
 
-class NPObject;
+typedef struct NPObject NPObject;
+typedef struct _NPP NPP_t;
+typedef NPP_t* NPP;
 
 namespace WebCore {
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list