[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[laszlo.1.gombos at nokia.com]

The following commit has been merged in the webkit-1.3 branch:
commit 9a700b6b8de9b5be8467e0a79f4b2698a292456d
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 17 08:28:19 2011 +0000

    2011-01-17  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Simon Hausmann.
    
            [Qt] [Symbian] Fix building NPAPI support
            https://bugs.webkit.org/show_bug.cgi?id=51981
    
            Make sure that npapi.h is always included outside of the extern "C"
            linkage declaration block.
    
            No new tests as there is no new functionality.
    
            * bridge/npruntime.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75925 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index a1664d6..d4216b2 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-17  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] [Symbian] Fix building NPAPI support
+        https://bugs.webkit.org/show_bug.cgi?id=51981
+
+        Make sure that npapi.h is always included outside of the extern "C"
+        linkage declaration block.
+
+        No new tests as there is no new functionality.
+
+        * bridge/npruntime.h:
+
 2011-01-17  Philippe Normand  <pnormand at igalia.com>
 
         Unreviewed, rolling out r75914.
diff --git a/Source/WebCore/bridge/npruntime.h b/Source/WebCore/bridge/npruntime.h
index 468cf92..828a340 100644
--- a/Source/WebCore/bridge/npruntime.h
+++ b/Source/WebCore/bridge/npruntime.h
@@ -33,12 +33,12 @@
 #ifndef _NP_RUNTIME_H_
 #define _NP_RUNTIME_H_
 
+#include "npapi.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "npapi.h"
-
 /*
     This API is used to facilitate binding code written in C to script
     objects.  The API in this header does not assume the presence of a

-- 
WebKit Debian packaging