--- a/src/3rdparty/webkit/WebCore/plugins/PluginPackage.h	Wed Jun 23 19:07:03 2010 +0300
+++ b/src/3rdparty/webkit/WebCore/plugins/PluginPackage.h	Tue Jul 06 15:10:48 2010 +0300
@@ -36,7 +36,7 @@
 #include <wtf/HashMap.h>
 #include <wtf/RefCounted.h>
 
-#if PLATFORM(SYMBIAN)
+#if OS(SYMBIAN)
 class QPluginLoader;
 class NPInterface;
 #endif
@@ -55,6 +55,7 @@
         const String& path() const { return m_path; }
         const String& fileName() const { return m_fileName; }
         const String& parentDirectory() const { return m_parentDirectory; }
+        uint16 NPVersion() const;
         time_t lastModified() const { return m_lastModified; }
 
         const MIMEToDescriptionsMap& mimeToDescriptions() const { return m_mimeToDescriptions; }
@@ -75,17 +76,17 @@
         int compare(const PluginPackage&) const;
         PluginQuirkSet quirks() const { return m_quirks; }
         const PlatformModuleVersion& version() const { return m_moduleVersion; }
-#if PLATFORM(SYMBIAN)
+#if OS(SYMBIAN)
         NPInterface* npInterface() const { return m_npInterface; }
-#endif // PLATFORM(SYMBIAN)
+#endif // OS(SYMBIAN)
 
     private:
         PluginPackage(const String& path, const time_t& lastModified);
 
-#if PLATFORM(SYMBIAN)
+#if OS(SYMBIAN)
         NPInterface* m_npInterface;
         QPluginLoader* m_pluginLoader;
-#endif // PLATFORM(SYMBIAN)
+#endif // OS(SYMBIAN)
         bool fetchInfo();
         bool isPluginBlacklisted();
         void determineQuirks(const String& mimeType);