3 files changed, 12 insertions, 5 deletions
diff --git a/TAO/tests/Multiple/Multiple.mpc b/TAO/tests/Multiple/Multiple.mpc
index 47b388a8e0f..bbb9570df52 100644
--- a/TAO/tests/Multiple/Multiple.mpc
+++ b/TAO/tests/Multiple/Multiple.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*Server): taoserver {
+  exename = server
   idlflags += -Gd
 
   Source_Files {
@@ -12,6 +13,7 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoexe, portableserver {
+  exename = client
   idlflags += -Gd
   after += *Server
 
diff --git a/TAO/tests/Multiple/client.cpp b/TAO/tests/Multiple/client.cpp
index 8a2d499abce..37dadd157cf 100644
--- a/TAO/tests/Multiple/client.cpp
+++ b/TAO/tests/Multiple/client.cpp
@@ -1,17 +1,20 @@
 // $Id$
 
 # include "Collocation_Tester.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (tests, client, "$Id$")
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // ORB Initialization
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO" ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "TAO" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object;
diff --git a/TAO/tests/Multiple/server.cpp b/TAO/tests/Multiple/server.cpp
index fcaa75221f3..0b251b2bfd6 100644
--- a/TAO/tests/Multiple/server.cpp
+++ b/TAO/tests/Multiple/server.cpp
@@ -2,18 +2,20 @@
 
 #include "Multiple_Impl.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (tests, server, "$Id$")
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
 
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Orb Initialization
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO" ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "TAO" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object;
@@ -49,7 +51,7 @@ int main (int argc, char *argv[])
 
       // If the ior_output_file exists, output the ior to it
 
-      FILE *output_file= ACE_OS::fopen ("s.ior", "w");
+      FILE *output_file= ACE_OS::fopen ("s.ior", ACE_TEXT("w"));
 
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,