ChangeLogTag: Tue Mar 9 17:00:11 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>

2 files changed, 11 insertions, 12 deletions

diff --git a/netsvcs/clients/Logger/direct_logging.cpp b/netsvcs/clients/Logger/direct_logging.cpp
index d1880808e13..7a5a72fb26b 100644
--- a/netsvcs/clients/Logger/direct_logging.cpp
+++ b/netsvcs/clients/Logger/direct_logging.cpp
@@ -11,14 +11,14 @@
 ACE_RCSID(Logger, direct_logging, "$Id$")
 
 static u_short LOGGER_PORT = ACE_DEFAULT_SERVER_PORT;
-static const char *const LOGGER_HOST = ACE_DEFAULT_SERVER_HOST;
-static const char *const DATA = "hello world\n";
+static const ACE_TCHAR *const LOGGER_HOST = ACE_DEFAULT_SERVER_HOST;
+static const ACE_TCHAR *const DATA = ACE_TEXT("hello world\n");
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   u_short logger_port  = argc > 1 ? ACE_OS::atoi (argv[1]) : LOGGER_PORT;
-  const char *logger_host = argc > 2 ? argv[2] : LOGGER_HOST;
+  const ACE_TCHAR *logger_host = argc > 2 ? argv[2] : LOGGER_HOST;
 
   ACE_SOCK_Stream logger;
   ACE_SOCK_Connector connector;
diff --git a/netsvcs/clients/Logger/indirect_logging.cpp b/netsvcs/clients/Logger/indirect_logging.cpp
index 2bec071fdaf..3e213c8d676 100644
--- a/netsvcs/clients/Logger/indirect_logging.cpp
+++ b/netsvcs/clients/Logger/indirect_logging.cpp
@@ -11,17 +11,16 @@
 
 ACE_RCSID(Logger, indirect_logging, "$Id$")
 
-int 
-main (int argc, char *argv[])
+int
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  const char *prog_name  = argv[0];
+  const ACE_TCHAR *prog_name  = argv[0];
   int iterations  = argc < 2 ? 10 : ACE_OS::atoi (argv[1]);
-  const char *logger_key = argc < 3 ? ACE_DEFAULT_LOGGER_KEY : argv[2];
+  const ACE_TCHAR *logger_key = argc < 3 ? ACE_DEFAULT_LOGGER_KEY : argv[2];
 
   ACE_OS::srand ((u_int) ACE_OS::time (0));
 
-  ACE_LOG_MSG->open (prog_name, ACE_Log_Msg::LOGGER,
-		             ACE_TEXT_CHAR_TO_TCHAR (logger_key));
+  ACE_LOG_MSG->open (prog_name, ACE_Log_Msg::LOGGER, logger_key);
 
   ACE_DEBUG ((LM_STARTUP, "starting up the test\n"));
 
@@ -29,8 +28,8 @@ main (int argc, char *argv[])
     {
       size_t priority = ACE_OS::rand () % int (LM_MAX);
       ACE_POW (priority);
-      ACE_DEBUG ((ACE_Log_Priority (priority), 
-		  "random message %d...\n", 
+      ACE_DEBUG ((ACE_Log_Priority (priority),
+		  "random message %d...\n",
 		  priority));
     }