[EFL] Unreviewed build fix with ENABLE_NETSCAPE_PLUGIN_API after r121467.

* plugins/efl/PluginPackageEfl.cpp:
(WebCore::PluginPackage::load): Move the declaration of `err'
before the first `goto' statement.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121678 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index cc0c957..49fc3f8 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2012-07-02  Raphael Kubo da Costa  <rakuco@webkit.org>
+
+        [EFL] Unreviewed build fix with ENABLE_NETSCAPE_PLUGIN_API after r121467.
+
+        * plugins/efl/PluginPackageEfl.cpp:
+        (WebCore::PluginPackage::load): Move the declaration of `err'
+        before the first `goto' statement.
+
 2012-07-02  Alexei Filippov  <alexeif@chromium.org>
 
         Web Inspector: replace recursion with a stack in DOM nodes snapshot traversal.

diff --git a/Source/WebCore/plugins/efl/PluginPackageEfl.cpp b/Source/WebCore/plugins/efl/PluginPackageEfl.cpp
index 5753ed7..35b1e7d 100644 (file)
--- a/Source/WebCore/plugins/efl/PluginPackageEfl.cpp
+++ b/Source/WebCore/plugins/efl/PluginPackageEfl.cpp
@@ -129,6 +129,8 @@ bool PluginPackage::load()
 
     m_isLoaded = true;
 
+    NPError err;
+
     NP_InitializeFuncPtr initialize = reinterpret_cast<NP_InitializeFuncPtr>(eina_module_symbol_get(m_module, "NP_Initialize"));
     if (!initialize) {
         EINA_LOG_ERR("Could not get symbol NP_Initialize");
@@ -147,9 +149,9 @@ bool PluginPackage::load()
     initializeBrowserFuncs();
 
 #if defined(XP_UNIX)
-    NPError err = initialize(&m_browserFuncs, &m_pluginFuncs);
+    err = initialize(&m_browserFuncs, &m_pluginFuncs);
 #else
-    NPError err = initialize(&m_browserFuncs);
+    err = initialize(&m_browserFuncs);
 #endif
     if (err != NPERR_NO_ERROR)
         goto abort;