File icedtea-web-1.1-moonlight-symbol-clash.patch of Package icedtea-web.openSUSE_13.1_Update

---
 plugin/icedteanp/IcedTeaNPPlugin.cc    |    8 ++++----
 plugin/icedteanp/IcedTeaNPPlugin.h     |    2 +-
 plugin/icedteanp/IcedTeaPluginUtils.cc |   12 ++++++------
 plugin/icedteanp/IcedTeaPluginUtils.h  |    2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

Index: icedtea-web-1.4.2/plugin/icedteanp/IcedTeaNPPlugin.cc
===================================================================
--- icedtea-web-1.4.2.orig/plugin/icedteanp/IcedTeaNPPlugin.cc
+++ icedtea-web-1.4.2/plugin/icedteanp/IcedTeaNPPlugin.cc
@@ -218,8 +218,8 @@ static gint instance_counter = 1;
 static GPid appletviewer_pid = -1;
 static guint appletviewer_watch_id = -1;
 
-int plugin_debug = getenv ("ICEDTEAPLUGIN_DEBUG") != NULL;
-int plugin_debug_suspend = (getenv("ICEDTEAPLUGIN_DEBUG") != NULL) &&
+int icedtea_plugin_debug = getenv ("ICEDTEAPLUGIN_DEBUG") != NULL;
+int icedtea_plugin_debug_suspend = (getenv("ICEDTEAPLUGIN_DEBUG") != NULL) &&
         (strcmp(getenv("ICEDTEAPLUGIN_DEBUG"), "suspend") == 0);
 
 pthread_cond_t cond_message_available = PTHREAD_COND_INITIALIZER;
@@ -1420,14 +1420,14 @@ plugin_start_appletviewer (ITNPPluginDat
   command_line.push_back(COVERAGE_AGENT);
 #endif
 
-  if (plugin_debug)
+  if (icedtea_plugin_debug)
   {
     command_line.push_back("-Xdebug");
     command_line.push_back("-Xnoagent");
 
     //Debug flags
     std::string debug_flags = "-Xrunjdwp:transport=dt_socket,address=8787,server=y,";
-    debug_flags += plugin_debug_suspend ? "suspend=y" : "suspend=n";
+    debug_flags += icedtea_plugin_debug_suspend ? "suspend=y" : "suspend=n";
     command_line.push_back(debug_flags);
   }
 
Index: icedtea-web-1.4.2/plugin/icedteanp/IcedTeaNPPlugin.h
===================================================================
--- icedtea-web-1.4.2.orig/plugin/icedteanp/IcedTeaNPPlugin.h
+++ icedtea-web-1.4.2/plugin/icedteanp/IcedTeaNPPlugin.h
@@ -94,7 +94,7 @@ extern pthread_t itnp_plugin_thread_id;
 extern pthread_mutex_t pluginAsyncCallMutex;
 
 // debug switch
-extern int plugin_debug;
+extern int icedtea_plugin_debug;
 
 // Browser function table.
 extern NPNetscapeFuncs browser_functions;
Index: icedtea-web-1.4.2/plugin/icedteanp/IcedTeaPluginUtils.cc
===================================================================
--- icedtea-web-1.4.2.orig/plugin/icedteanp/IcedTeaPluginUtils.cc
+++ icedtea-web-1.4.2/plugin/icedteanp/IcedTeaPluginUtils.cc
@@ -434,7 +434,7 @@ IcedTeaPluginUtilities::printStringVecto
 {
 
         // This is a CPU intensive function. Run only if debugging
-        if (!plugin_debug)
+        if (!icedtea_plugin_debug)
             return;
 
 	std::string* str = new std::string();
@@ -614,7 +614,7 @@ void
 IcedTeaPluginUtilities::printStringPtrVector(const char* prefix, std::vector<std::string*>* str_ptr_vector)
 {
         // This is a CPU intensive function. Run only if debugging
-        if (!plugin_debug)
+        if (!icedtea_plugin_debug)
             return;
 
 	std::string* str = new std::string();
@@ -638,7 +638,7 @@ void
 IcedTeaPluginUtilities::printNPVariant(NPVariant variant)
 {
     // This is a CPU intensive function. Run only if debugging
-    if (!plugin_debug)
+    if (!icedtea_plugin_debug)
         return;
 
     if (NPVARIANT_IS_VOID(variant))
Index: icedtea-web-1.4.2/plugin/icedteanp/IcedTeaPluginUtils.h
===================================================================
--- icedtea-web-1.4.2.orig/plugin/icedteanp/IcedTeaPluginUtils.h
+++ icedtea-web-1.4.2/plugin/icedteanp/IcedTeaPluginUtils.h
@@ -62,7 +62,7 @@ exception statement from your version. *
 #define PLUGIN_DEBUG(...)                                      \
   do                                                           \
   {                                                            \
-    if (plugin_debug)                                          \
+    if (icedtea_plugin_debug)                                          \
     {                                                          \
       fprintf (stderr, "ITNPP Thread# %ld: ", pthread_self()); \
       fprintf (stderr, __VA_ARGS__);                           \
Index: icedtea-web-1.4.2/tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc
===================================================================
--- icedtea-web-1.4.2.orig/tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc
+++ icedtea-web-1.4.2/tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc
@@ -172,14 +172,14 @@ void doDebugErrorRun() {
 }
 
 TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_on) {
-	bool plugin_debug_backup = plugin_debug;
-	plugin_debug = true;
+	bool plugin_debug_backup = icedtea_plugin_debug;
+	icedtea_plugin_debug = true;
 	doDebugErrorRun();
-	plugin_debug = plugin_debug_backup;
+	icedtea_plugin_debug = plugin_debug_backup;
 }
 TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_off) {
-	bool plugin_debug_backup = plugin_debug;
-	plugin_debug = false;
+	bool plugin_debug_backup = icedtea_plugin_debug;
+	icedtea_plugin_debug = false;
 	doDebugErrorRun();
-	plugin_debug = plugin_debug_backup;
+	icedtea_plugin_debug = plugin_debug_backup;
 }