Changeset 371 for trunk/icedtea-web/plugin/icedteanp/IcedTeaNPPlugin.cc

Timestamp:

May 25, 2012, 3:59:24 PM (13 years ago)

Author:

dmik

Message:

icedtea-web: DT_SOCKET DLL is JDTSOCK.DLL on OS/2.

File:

• trunk/icedtea-web/plugin/icedteanp/IcedTeaNPPlugin.cc (modified) (5 diffs)

trunk/icedtea-web/plugin/icedteanp/IcedTeaNPPlugin.cc

@@ -63 +63 @@
 
 #include "OS.h"
+
+#ifdef __OS2__
+#define DT_SOCKET_DLL "jdtsock"
+#else
+#define DT_SOCKET_DLL "dt_socket"
+#endif
 
 #if MOZILLA_VERSION_COLLAPSED < 1090100
@@ -473 +479 @@
       goto cleanup_in_pipe;
     }
-  PLUGIN_DEBUG ("ITNP_New: created input fifo: %d/%d\n", in_pipe[0], in_pipe[1]);
+  PLUGIN_DEBUG ("ITNP_New: created input fifo: %d/%d\n", in_pipe [0], in_pipe [1]);
 #else
   // in_pipe_name
@@ -506 +512 @@
   if (socketpair (AF_LOCAL, SOCK_STREAM, 0, out_pipe) == -1)
     {
-      PLUGIN_ERROR_TWO ("Failed to create input pipe", strerror (errno));
+      PLUGIN_ERROR_TWO ("Failed to create output pipe", strerror (errno));
       np_error = NPERR_GENERIC_ERROR;
       goto cleanup_out_pipe;
     }
-  PLUGIN_DEBUG ("ITNP_New: created output fifo: %d/%d\n", out_pipe[0], out_pipe[1]);
+  PLUGIN_DEBUG ("ITNP_New: created output fifo: %d/%d\n", out_pipe [0], out_pipe [1]);
 #else
   // out_pipe_name
@@ -553 +559 @@
   // out_to_appletviewer
 #ifdef __OS2__
-  out_to_appletviewer = g_io_channel_unix_new (out_pipe[0]);
+  out_to_appletviewer = g_io_channel_unix_new (out_pipe [0]);
 #else
   out_to_appletviewer = g_io_channel_new_file (out_pipe_name,
@@ -1623 +1629 @@
       if (plugin_debug_suspend)
       {
-          command_line[cmd_num++] = g_strdup("-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y");
+          command_line[cmd_num++] = g_strdup("-Xrunjdwp:transport="DT_SOCKET_DLL",address=8787,server=y,suspend=y");
       } else
       {
-          command_line[cmd_num++] = g_strdup("-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n");
+          command_line[cmd_num++] = g_strdup("-Xrunjdwp:transport="DT_SOCKET_DLL",address=8787,server=y,suspend=n");
       }
       command_line[cmd_num++] = g_strdup("sun.applet.PluginMain");