diff options
Diffstat (limited to 'src/3rdparty/webkit/WebCore/plugins/PluginPackage.cpp')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/plugins/PluginPackage.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/3rdparty/webkit/WebCore/plugins/PluginPackage.cpp b/src/3rdparty/webkit/WebCore/plugins/PluginPackage.cpp index 8f2dfa990b..ad03ecd8d3 100644 --- a/src/3rdparty/webkit/WebCore/plugins/PluginPackage.cpp +++ b/src/3rdparty/webkit/WebCore/plugins/PluginPackage.cpp @@ -113,7 +113,7 @@ PluginPackage::PluginPackage(const String& path, const time_t& lastModified) m_parentDirectory = m_path.left(m_path.length() - m_fileName.length() - 1); } -#if !PLATFORM(SYMBIAN) +#if !OS(SYMBIAN) void PluginPackage::unload() { if (!m_isLoaded) @@ -126,7 +126,7 @@ void PluginPackage::unload() unloadWithoutShutdown(); } -#endif //!PLATFORM(SYMBIAN) +#endif // !OS(SYMBIAN) void PluginPackage::unloadWithoutShutdown() { @@ -198,7 +198,7 @@ void PluginPackage::determineQuirks(const String& mimeType) } #endif -#if !PLATFORM(WIN_OS) +#if !OS(WINDOWS) void PluginPackage::determineModuleVersionFromDescription() { // It's a bit lame to detect the plugin version by parsing it @@ -253,7 +253,7 @@ void PluginPackage::initializeBrowserFuncs() { memset(&m_browserFuncs, 0, sizeof(m_browserFuncs)); m_browserFuncs.size = sizeof(m_browserFuncs); - m_browserFuncs.version = NP_VERSION_MINOR; + m_browserFuncs.version = NPVersion(); m_browserFuncs.geturl = NPN_GetURL; m_browserFuncs.posturl = NPN_PostURL; @@ -326,7 +326,7 @@ int PluginPackage::compareFileVersion(const PlatformModuleVersion& compareVersio // return -1, 0, or 1 if plug-in version is less than, equal to, or greater than // the passed version -#if PLATFORM(WIN_OS) +#if OS(WINDOWS) if (m_moduleVersion.mostSig != compareVersion.mostSig) return m_moduleVersion.mostSig > compareVersion.mostSig ? 1 : -1; if (m_moduleVersion.leastSig != compareVersion.leastSig) |