*** empty log message ***

13 files changed, 73 insertions, 39 deletions

diff --git a/ace/Default_Constants.h b/ace/Default_Constants.h
index 9b75b3c2acf..85820e5d603 100644
--- a/ace/Default_Constants.h
+++ b/ace/Default_Constants.h
@@ -51,7 +51,8 @@
 #endif /* ACE_DEFAULT_PAGEFILE_POOL_CHUNK */
 
 #if !defined (ACE_DEFAULT_PAGEFILE_POOL_NAME)
-#define ACE_DEFAULT_PAGEFILE_POOL_NAME ACE_LIB_TEXT ("Default_ACE_Pagefile_Memory_Pool")
+#define ACE_DEFAULT_PAGEFILE_POOL_NAME_A "Default_ACE_Pagefile_Memory_Pool"
+#define ACE_DEFAULT_PAGEFILE_POOL_NAME ACE_LIB_TEXT (ACE_DEFAULT_PAGEFILE_POOL_NAME_A)
 #endif /* ACE_DEFAULT_PAGEFILE_POOL_NAME */
 
 #if !defined (ACE_DEFAULT_MESSAGE_BLOCK_PRIORITY)
@@ -120,7 +121,8 @@
 # endif /* ACE_DEFAULT_MAX_SOCKET_BUFSIZ */
 
 # if !defined (ACE_DEFAULT_SERVER_PORT_STR)
-#   define ACE_DEFAULT_SERVER_PORT_STR ACE_LIB_TEXT("20002")
+#   define ACE_DEFAULT_SERVER_PORT_STR_A "20002"
+#   define ACE_DEFAULT_SERVER_PORT_STR ACE_LIB_TEXT(ACE_DEFAULT_SERVER_PORT_STR_A)
 # endif /* ACE_DEFAULT_SERVER_PORT_STR */
 
 // Used for the Service_Directory test
@@ -195,9 +197,11 @@
 // Used by the FIFO tests and the Client_Logging_Handler netsvc.
 # if !defined (ACE_DEFAULT_RENDEZVOUS)
 #   if defined (ACE_HAS_STREAM_PIPES)
-#     define ACE_DEFAULT_RENDEZVOUS ACE_LIB_TEXT("/tmp/fifo.ace")
+#     define ACE_DEFAULT_RENDEZVOUS_A "/tmp/fifo.ace"
+#     define ACE_DEFAULT_RENDEZVOUS ACE_LIB_TEXT(ACE_DEFAULT_RENDEZVOUS_A)
 #   else
-#     define ACE_DEFAULT_RENDEZVOUS ACE_LIB_TEXT("localhost:20010")
+#     define ACE_DEFAULT_RENDEZVOUS_A "localhost:20010"
+#     define ACE_DEFAULT_RENDEZVOUS ACE_LIB_TEXT(ACE_DEFAULT_RENDEZVOUS_A)
 #   endif /* ACE_HAS_STREAM_PIPES */
 # endif /* ACE_DEFAULT_RENDEZVOUS */
 
@@ -209,23 +213,27 @@
 # if !defined (ACE_DEFAULT_LOGGER_KEY)
 
 #     if defined (ACE_HAS_STREAM_PIPES)
-#       define ACE_DEFAULT_LOGGER_KEY ACE_LIB_TEXT ("/tmp/server_daemon")
+#       define ACE_DEFAULT_LOGGER_KEY_A "/tmp/server_daemon"
+#       define ACE_DEFAULT_LOGGER_KEY ACE_LIB_TEXT (ACE_DEFAULT_LOGGER_KEY_A)
 #     else
-#       define ACE_DEFAULT_LOGGER_KEY ACE_LIB_TEXT ("localhost:20012")
+#       define ACE_DEFAULT_LOGGER_KEY_A "localhost:20012"
+#       define ACE_DEFAULT_LOGGER_KEY ACE_LIB_TEXT (ACE_DEFAULT_LOGGER_KEY_A)
 #     endif /* ACE_HAS_STREAM_PIPES */
 # endif /* ACE_DEFAULT_LOGGER_KEY */
 
 // The way to specify the local host for loopback IP. This is usually
 // "localhost" but it may need changing on some platforms.
 # if !defined (ACE_LOCALHOST)
-#   define ACE_LOCALHOST ACE_LIB_TEXT ("localhost")
+#   define ACE_LOCALHOST_A "localhost"
+#   define ACE_LOCALHOST ACE_LIB_TEXT (ACE_LOCALHOST_A)
 # endif
 
 // This specification for an IPv6 localhost should work on all platforms
 // supporting IPv6
 # if defined (ACE_HAS_IPV6)
 #   if !defined (ACE_IPV6_LOCALHOST)
-#     define ACE_IPV6_LOCALHOST ACE_LIB_TEXT ("::1")
+#     define ACE_IPV6_LOCALHOST_A "::1"
+#     define ACE_IPV6_LOCALHOST ACE_LIB_TEXT (ACE_IPV6_LOCALHOST_A)
 #   endif /* ACE_IPV6_LOCALHOST*/
 #endif /* ACE_HAS_IPV6 */
 
@@ -233,14 +241,17 @@
 // supporting IPv6
 # if defined (ACE_HAS_IPV6)
 #   if !defined (ACE_IPV6_ANY)
-#     define ACE_IPV6_ANY ACE_LIB_TEXT ("::")
+#     define ACE_IPV6_ANY_A "::"
+#     define ACE_IPV6_ANY ACE_LIB_TEXT (ACE_IPV6_ANY_A)
 #   endif /* ACE_IPV6_ANY*/
 #endif /* ACE_HAS_IPV6 */
 
 # if !defined (ACE_DEFAULT_SERVER_HOST)
 #   if defined (ACE_HAS_IPV6)
+#     define ACE_DEFAULT_SERVER_HOST_A ACE_IPV6_LOCALHOST_A
 #     define ACE_DEFAULT_SERVER_HOST ACE_IPV6_LOCALHOST
 #   else /*ACE_HAS_IPV6*/
+#     define ACE_DEFAULT_SERVER_HOST_A ACE_LOCALHOST_A
 #     define ACE_DEFAULT_SERVER_HOST ACE_LOCALHOST
 #   endif /*ACE_HAS_IPV6*/
 # endif /* ACE_DEFAULT_SERVER_HOST */
@@ -498,9 +509,11 @@
 // Used for dynamic linking
 #   if !defined (ACE_DEFAULT_SVC_CONF)
 #     if (ACE_USES_CLASSIC_SVC_CONF == 1)
-#       define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT (".\\svc.conf")
+#       define ACE_DEFAULT_SVC_CONF_A ".\\svc.conf"
+#       define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT (ACE_DEFAULT_SVC_CONF_A)
 #     else
-#       define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT (".\\svc.conf.xml")
+#       define ACE_DEFAULT_SVC_CONF_A ".\\svc.conf.xml"
+#       define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT (ACE_DEFAULT_SVC_CONF_A)
 #     endif /* ACE_USES_CLASSIC_SVC_CONF ==1 */
 #   endif /* ACE_DEFAULT_SVC_CONF */
 #endif /* ACE_WIN32 */
@@ -508,14 +521,17 @@
  // Used for dynamic linking.
 #if !defined (ACE_DEFAULT_SVC_CONF)
 #  if (ACE_USES_CLASSIC_SVC_CONF == 1)
-#    define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT ("./svc.conf")
+#    define ACE_DEFAULT_SVC_CONF_A "./svc.conf"
+#    define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT (ACE_DEFAULT_SVC_CONF_A)
 #  else
-#    define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT ("./svc.conf.xml")
+#    define ACE_DEFAULT_SVC_CONF_A "./svc.conf.xml"
+#    define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT (ACE_DEFAULT_SVC_CONF_A)
 #  endif /* ACE_USES_CLASSIC_SVC_CONF ==1 */
 #endif /* ACE_DEFAULT_SVC_CONF */
 
 #if !defined (ACE_LOGGER_KEY)
-#  define ACE_LOGGER_KEY ACE_LIB_TEXT ("/tmp/server_daemon")
+#  define ACE_LOGGER_KEY_A "/tmp/server_daemon"
+#  define ACE_LOGGER_KEY ACE_LIB_TEXT (ACE_LOGGER_KEY_A)
 #endif /* ACE_LOGGER_KEY */
 
 // Theses defines are used by the ACE Name Server.
diff --git a/examples/ASX/Event_Server/Event_Server/Options.cpp b/examples/ASX/Event_Server/Event_Server/Options.cpp
index f9bfbf6a147..ac98f1f45db 100644
--- a/examples/ASX/Event_Server/Event_Server/Options.cpp
+++ b/examples/ASX/Event_Server/Event_Server/Options.cpp
@@ -186,12 +186,12 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
 #define ACE_TEXT(A) A
   if (this->verbose ())
     ACE_OS::printf ("%8d = initial concurrency hint\n"
-	      ACE_SIZE_T_FORMAT_SPECIFIER " = total iterations\n"
-	      ACE_SIZE_T_FORMAT_SPECIFIER " = thread count\n"
-	      ACE_SIZE_T_FORMAT_SPECIFIER " = low water mark\n"
-	      ACE_SIZE_T_FORMAT_SPECIFIER " = high water mark\n"
-	      ACE_SIZE_T_FORMAT_SPECIFIER " = message_size\n"
-	      ACE_SIZE_T_FORMAT_SPECIFIER " = initial queue length\n"
+	      ACE_SIZE_T_FORMAT_SPECIFIER_A " = total iterations\n"
+	      ACE_SIZE_T_FORMAT_SPECIFIER_A " = thread count\n"
+	      ACE_SIZE_T_FORMAT_SPECIFIER_A " = low water mark\n"
+	      ACE_SIZE_T_FORMAT_SPECIFIER_A " = high water mark\n"
+	      ACE_SIZE_T_FORMAT_SPECIFIER_A " = message_size\n"
+	      ACE_SIZE_T_FORMAT_SPECIFIER_A " = initial queue length\n"
 	      "%8d = THR_BOUND\n"
 	      "%8d = THR_NEW_LWP\n",
 	      ACE_Thread::getconcurrency (),
diff --git a/examples/ASX/Message_Queue/buffer_stream.cpp b/examples/ASX/Message_Queue/buffer_stream.cpp
index 1cac4975dd4..cef4a62ae51 100644
--- a/examples/ASX/Message_Queue/buffer_stream.cpp
+++ b/examples/ASX/Message_Queue/buffer_stream.cpp
@@ -242,7 +242,7 @@ Filter::put (ACE_Message_Block *mb,
 
       // Prepend the line count in front of the buffer.
       ACE_OS::sprintf (mb->rd_ptr (),
-                       ACE_SIZE_T_FORMAT_SPECIFIER
+                       ACE_SIZE_T_FORMAT_SPECIFIER_A
                        ": %s",
                        this->count_++,
                        buf);
diff --git a/examples/C++NPv1/Iterative_Logging_Server.cpp b/examples/C++NPv1/Iterative_Logging_Server.cpp
index 7b7f8959163..ca8a7478064 100644
--- a/examples/C++NPv1/Iterative_Logging_Server.cpp
+++ b/examples/C++NPv1/Iterative_Logging_Server.cpp
@@ -5,13 +5,15 @@
 */
 
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 #include "Iterative_Logging_Server.h"
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Iterative_Logging_Server server;
 
-  if (server.run (argc, argv) == -1)
+  if (server.run (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "server.run()"), 1);
   return 0;
 }
diff --git a/examples/C++NPv1/Logging_Client.cpp b/examples/C++NPv1/Logging_Client.cpp
index 2cf306868ea..764b0682f5b 100644
--- a/examples/C++NPv1/Logging_Client.cpp
+++ b/examples/C++NPv1/Logging_Client.cpp
@@ -12,6 +12,7 @@
 #include "ace/Log_Msg.h"
 #include "ace/Log_Record.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
@@ -39,7 +40,7 @@ int operator<< (ACE_OutputCDR &cdr, const ACE_Log_Record &log_record)
   cdr << ACE_CDR::Long (log_record.time_stamp ().sec ());
   cdr << ACE_CDR::Long (log_record.time_stamp ().usec ());
   cdr << ACE_CDR::ULong (msglen);
-  cdr.write_char_array (nonconst_record.msg_data (), msglen);
+  cdr.write_char_array (ACE_TEXT_TO_CHAR_IN(nonconst_record.msg_data ()), msglen);
   return cdr.good_bit ();
 }
 
@@ -91,11 +92,15 @@ public:
 };
 
 
-int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *targv[])
 {
+  ACE_Argv_Type_Converter convert (argc, targv);
+  argc = convert.get_argc();
+  char** argv = convert.get_ASCII_argv();
+
   u_short logger_port = argc > 1 ? atoi (argv[1]) : 0;
   const char *logger_host =
-    argc > 2 ? argv[2] : ACE_DEFAULT_SERVER_HOST;
+    argc > 2 ? argv[2] : ACE_DEFAULT_SERVER_HOST_A;
   int result;
 
   ACE_INET_Addr server_addr;
@@ -150,7 +155,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     ACE_Time_Value now (ACE_OS::gettimeofday ());
     ACE_Log_Record log_record (LM_INFO, now, ACE_OS::getpid ());
-    log_record.msg_data (user_input.c_str ());
+    log_record.msg_data (ACE_TEXT_TO_TCHAR_IN(user_input.c_str ()));
     if (logging_client.send (log_record) == -1)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "%p\n", "logging_client.send()"), 1);
diff --git a/examples/C++NPv1/Logging_Handler.cpp b/examples/C++NPv1/Logging_Handler.cpp
index dc1d56b3190..e29faf77812 100644
--- a/examples/C++NPv1/Logging_Handler.cpp
+++ b/examples/C++NPv1/Logging_Handler.cpp
@@ -27,13 +27,13 @@ int operator>> (ACE_InputCDR &cdr, ACE_Log_Record &log_record)
   // Extract each field from input CDR stream into <log_record>.
   if ((cdr >> type) && (cdr >> pid) && (cdr >> sec) && (cdr >> usec)
       && (cdr >> buffer_len)) {
-    ACE_TCHAR log_msg[ACE_Log_Record::MAXLOGMSGLEN+1];
+    char log_msg[ACE_Log_Record::MAXLOGMSGLEN+1];
     log_record.type (type);
     log_record.pid (pid);
     log_record.time_stamp (ACE_Time_Value (sec, usec));
     cdr.read_char_array (log_msg, buffer_len);
     log_msg[buffer_len] = '\0';
-    log_record.msg_data (log_msg);
+    log_record.msg_data (ACE_TEXT_TO_TCHAR_IN(log_msg));
   }
   return cdr.good_bit ();
 }
@@ -113,7 +113,7 @@ int Logging_Handler::write_log_record (ACE_Message_Block *mblk)
     cdr >> length;
     ACE_Log_Record log_record;
     cdr >> log_record;  // Finally extract the <ACE_log_record>.
-    log_record.print (mblk->rd_ptr (), 1, cerr);
+    log_record.print (ACE_TEXT_TO_TCHAR_IN(mblk->rd_ptr ()), 1, cerr);
   }
   return mblk->total_length ();
 }
diff --git a/examples/C++NPv1/Logging_Server.cpp b/examples/C++NPv1/Logging_Server.cpp
index c685412c769..161adfa3ecc 100644
--- a/examples/C++NPv1/Logging_Server.cpp
+++ b/examples/C++NPv1/Logging_Server.cpp
@@ -52,16 +52,16 @@ int Logging_Server::open (u_short logger_port)
 int Logging_Server::make_log_file (ACE_FILE_IO &logging_file,
                                    ACE_SOCK_Stream *logging_peer)
 {
-  char filename[MAXHOSTNAMELEN + sizeof (".log")];
+  ACE_TCHAR filename[MAXHOSTNAMELEN + sizeof (ACE_TEXT(".log"))];
 
   if (logging_peer != 0) { // Use client's hostname as log file name.
     ACE_INET_Addr logging_peer_addr;
     logging_peer->get_remote_addr (logging_peer_addr);
     logging_peer_addr.get_host_name (filename, MAXHOSTNAMELEN);
-    ACE_OS::strcat (filename, ".log");
+    ACE_OS::strcat (filename, ACE_TEXT(".log"));
   }
   else
-    ACE_OS::strcpy (filename, "logging_server.log");
+    ACE_OS::strcpy (filename, ACE_TEXT("logging_server.log"));
 
   ACE_FILE_Connector connector;
   return connector.connect (logging_file,
diff --git a/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp b/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp
index eec3e0639ef..f992ea824bc 100644
--- a/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp
+++ b/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp
@@ -9,6 +9,7 @@
 #include "ace/Signal.h"
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/os_fcntl.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "Process_Per_Connection_Logging_Server.h"
 #include "Logging_Handler.h"
@@ -166,13 +167,15 @@ Process_Per_Connection_Logging_Server::run_worker (int, char *argv[])
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   // Register to receive the <SIGTERM> signal.
   ACE_Sig_Action sa ((ACE_SignalHandler)sigterm_handler,
                      SIGTERM);
 
   Process_Per_Connection_Logging_Server server;
 
-  if (server.run (argc, argv) == -1 && errno != EINTR)
+  if (server.run (convert.get_argc(), convert.get_ASCII_argv()) == -1 && errno != EINTR)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "server.run()"), 1);
 
   // Barrier synchronization.
diff --git a/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp b/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp
index 0a8fd2ad8bc..2984d558eb5 100644
--- a/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp
+++ b/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp
@@ -10,6 +10,7 @@
 #include "ace/Sched_Params.h"
 #include "ace/Signal.h"
 #include "ace/Thread_Manager.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "RT_Thread_Per_Connection_Logging_Server.h"
 #include "Logging_Handler.h"
@@ -116,13 +117,14 @@ Thread_Per_Connection_Logging_Server::handle_data (ACE_SOCK_Stream *client)
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   // Register to receive the <SIGTERM> signal.
   ACE_Sig_Action sa ((ACE_SignalHandler) sigterm_handler,
                      SIGTERM);
 
   RT_Thread_Per_Connection_Logging_Server server;
 
-  if (server.run (argc, argv) == -1)
+  if (server.run (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "server.run()"), 1);
 
   // Cooperative thread cancellation and barrier synchronization.
diff --git a/examples/C++NPv1/Reactive_Logging_Server.cpp b/examples/C++NPv1/Reactive_Logging_Server.cpp
index a59c4e10140..2c493aecf8b 100644
--- a/examples/C++NPv1/Reactive_Logging_Server.cpp
+++ b/examples/C++NPv1/Reactive_Logging_Server.cpp
@@ -5,13 +5,15 @@
 */
 
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 #include "Reactive_Logging_Server.h"
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Reactive_Logging_Server server;
 
-  if (server.run (argc, argv) == -1)
+  if (server.run (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "server.run()"), 1);
   return 0;
 }
diff --git a/examples/C++NPv1/Reactive_Logging_Server_Ex.cpp b/examples/C++NPv1/Reactive_Logging_Server_Ex.cpp
index 34e7c85a3dd..e735fb24183 100644
--- a/examples/C++NPv1/Reactive_Logging_Server_Ex.cpp
+++ b/examples/C++NPv1/Reactive_Logging_Server_Ex.cpp
@@ -6,14 +6,16 @@
 
 #include "ace/Functor.h"
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "Reactive_Logging_Server_Ex.h"
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Reactive_Logging_Server_Ex server;
 
-  if (server.run (argc, argv) == -1)
+  if (server.run (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "server.run()"), 1);
   return 0;
 }
diff --git a/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp b/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp
index db48a48c854..d1c0a0b3021 100644
--- a/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp
+++ b/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp
@@ -9,6 +9,7 @@
 #include "ace/Log_Msg.h"
 #include "ace/Signal.h"
 #include "ace/Thread_Manager.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "Thread_Per_Connection_Logging_Server.h"
 #include "Logging_Handler.h"
@@ -77,13 +78,14 @@ Thread_Per_Connection_Logging_Server::handle_data (ACE_SOCK_Stream *client)
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   // Register to receive the <SIGTERM> signal.
   ACE_Sig_Action sa ((ACE_SignalHandler) sigterm_handler,
                      SIGTERM);
 
   Thread_Per_Connection_Logging_Server server;
 
-  if (server.run (argc, argv) == -1)
+  if (server.run (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "server.run()"), 1);
 
   // Cooperative thread cancellation and barrier synchronization.
diff --git a/examples/C++NPv2/Logging_Event_Handler.cpp b/examples/C++NPv2/Logging_Event_Handler.cpp
index d805e776390..3bac6208b27 100644
--- a/examples/C++NPv2/Logging_Event_Handler.cpp
+++ b/examples/C++NPv2/Logging_Event_Handler.cpp
@@ -12,8 +12,8 @@
 
 int Logging_Event_Handler::open () {
 
-  static const char LOGFILE_SUFFIX[] = ".log";
-  char filename[MAXHOSTNAMELEN + sizeof (LOGFILE_SUFFIX)];
+  static const ACE_TCHAR LOGFILE_SUFFIX[] = ACE_TEXT(".log");
+  ACE_TCHAR filename[MAXHOSTNAMELEN + sizeof (LOGFILE_SUFFIX)];
   ACE_INET_Addr logging_peer_addr;
 
   logging_handler_.peer ().get_remote_addr (logging_peer_addr);