File icedtea6-1.9.4-moonlight-symbol-clash.patch of Package java-1_6_0-openjdk

Index: icedtea6-1.9.4/plugin/icedteanp/IcedTeaNPPlugin.cc
===================================================================
--- icedtea6-1.9.4.orig/plugin/icedteanp/IcedTeaNPPlugin.cc	2011-01-31 10:08:56.000000000 +0100
+++ icedtea6-1.9.4/plugin/icedteanp/IcedTeaNPPlugin.cc	2011-01-31 10:11:29.603519684 +0100
@@ -234,7 +234,7 @@
 static GPid appletviewer_pid = -1;
 static guint appletviewer_watch_id = -1;
 
-int plugin_debug = getenv ("ICEDTEAPLUGIN_DEBUG") != NULL;
+int icedtea_plugin_debug = getenv ("ICEDTEAPLUGIN_DEBUG") != NULL;
 
 pthread_cond_t cond_message_available = PTHREAD_COND_INITIALIZER;
 
@@ -1534,7 +1534,7 @@
   gchar** command_line;
   gchar** environment;
 
-  if (plugin_debug)
+  if (icedtea_plugin_debug)
   {
       command_line = (gchar**) malloc(sizeof(gchar*)*8);
       command_line[0] = g_strdup(appletviewer_executable);
@@ -1580,7 +1580,7 @@
   g_free (command_line[1]);
   command_line[1] = NULL;
 
-  if (plugin_debug)
+  if (icedtea_plugin_debug)
   {
       g_free (command_line[2]);
       command_line[2] = NULL;
Index: icedtea6-1.9.4/plugin/icedteanp/IcedTeaNPPlugin.h
===================================================================
--- icedtea6-1.9.4.orig/plugin/icedteanp/IcedTeaNPPlugin.h	2010-12-01 20:08:14.000000000 +0100
+++ icedtea6-1.9.4/plugin/icedteanp/IcedTeaNPPlugin.h	2011-01-31 10:11:29.595520091 +0100
@@ -96,7 +96,7 @@
 extern pthread_cond_t cond_message_available;
 
 // debug switch
-extern int plugin_debug;
+extern int icedtea_plugin_debug;
 
 // Browser function table.
 extern NPNetscapeFuncs browser_functions;
Index: icedtea6-1.9.4/plugin/icedteanp/IcedTeaPluginUtils.cc
===================================================================
--- icedtea6-1.9.4.orig/plugin/icedteanp/IcedTeaPluginUtils.cc	2010-12-01 20:08:15.000000000 +0100
+++ icedtea6-1.9.4/plugin/icedteanp/IcedTeaPluginUtils.cc	2011-01-31 10:11:29.595520091 +0100
@@ -401,7 +401,7 @@
 
 	wchar_t c;
 
-	if (plugin_debug) printf("Converted UTF-16LE string: ");
+	if (icedtea_plugin_debug) printf("Converted UTF-16LE string: ");
 
 	result_unicode_str->clear();
 	for (int i = begin; i < begin+length; i+=2)
@@ -415,14 +415,14 @@
         	(c >= 'A' && c <= 'Z') ||
         	(c >= '0' && c <= '9'))
         {
-        	if (plugin_debug) printf("%c", c);
+        	if (icedtea_plugin_debug) printf("%c", c);
         }
 
         result_unicode_str->push_back(c);
 	}
 
 	// not routing via debug print macros due to wide-string issues
-	if (plugin_debug) printf(". Length=%d\n", result_unicode_str->length());
+	if (icedtea_plugin_debug) printf(". Length=%d\n", result_unicode_str->length());
 }
 
 /*
@@ -436,7 +436,7 @@
 {
 
         // This is a CPU intensive function. Run only if debugging
-        if (!plugin_debug)
+        if (!icedtea_plugin_debug)
             return;
 
 	std::string* str = new std::string();
@@ -612,7 +612,7 @@
 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();
@@ -636,7 +636,7 @@
 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: icedtea6-1.9.4/plugin/icedteanp/IcedTeaPluginUtils.h
===================================================================
--- icedtea6-1.9.4.orig/plugin/icedteanp/IcedTeaPluginUtils.h	2010-12-01 20:08:15.000000000 +0100
+++ icedtea6-1.9.4/plugin/icedteanp/IcedTeaPluginUtils.h	2011-01-31 10:11:29.599519887 +0100
@@ -69,7 +69,7 @@
 #define PLUGIN_DEBUG(...) \
   do                                                          \
   {                                                           \
-    if (plugin_debug)                                         \
+    if (icedtea_plugin_debug)                                         \
     {                                                         \
       fprintf (stderr, "ITNPP Thread# %ld: ", pthread_self()); \
       fprintf (stderr, __VA_ARGS__);                          \