Thu Jun 28 14:07:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

11 files changed, 48 insertions, 35 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index f8baf0ee69d..73508614f4f 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,12 +1,26 @@
+Thu Jun 28 14:07:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * apps/drwho/client.cpp:
+        * apps/drwho/server.cpp:
+        * apps/Gateway/Gateway/Config_Files.cpp:
+        * apps/gperf/src/gperf.cpp:
+        * apps/JAWS2/main.cpp:
+        * apps/JAWS3/bench/mkfiles.cpp:
+        * apps/JAWS3/bench/rqfiles.cpp:
+        * apps/JAWS/clients/Caching/test_URL.cpp:
+        * apps/JAWS/server/main.cpp:
+        * apps/JAWS/stress_testing/benchd.cpp:
+          Changed main to ACE_TMAIN
+
 Thu Jun 28 10:08:38 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * ace/CDR_Stream.h:
-        
+
           Removed 'extern' qualifier from ostream operator declarations, it's
           not needed.
-          
+
         * ace/CDR_Stream.cpp:
-        
+
           Added explicit temporary of ACE_OutputCDR::from_wchar in the
           ostream operator implementation taking ACE_OutputCDR::from_octet.
           Unix compilers were apparently making some kind of promotion
@@ -14,13 +28,13 @@ Thu Jun 28 10:08:38 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
 
 Tue Jun 26 13:48:26 UTC 2007  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-        * apps/JAWS2/HTTPU/http_status.cpp: Added 
-        
+        * apps/JAWS2/HTTPU/http_status.cpp: Added
+
           #include "ace/Log_Msg.h"
-          
+
           so the ACE_DEBUG macro would be visible.  Thanks to Venkat
           Forums <venkat dot forums at gmail dot com> for reporting this.
-  
+
 Thu Jun 28 07:32:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/Truncate.h:
@@ -253,7 +267,6 @@ Wed Jun 27 03:50:39 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
           fixed). For now, it will only flag that fact that a file contains
           tabs once.
 
->>>>>>> .r78612
 Mon Jun 25 11:34:36 CDT 2007  Ciju John  <johnc@ociweb.com>
 
         * ACE version 5.5.9 released.
diff --git a/ACE/apps/Gateway/Gateway/Config_Files.cpp b/ACE/apps/Gateway/Gateway/Config_Files.cpp
index 9ead4611696..70784f2a221 100644
--- a/ACE/apps/Gateway/Gateway/Config_Files.cpp
+++ b/ACE/apps/Gateway/Gateway/Config_Files.cpp
@@ -142,7 +142,7 @@ Connection_Config_File_Parser::read_entry (Connection_Config_Info &entry,
 
 #if defined (GATEWAY_DEBUGGING)
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   FP_RETURN_TYPE result;
   int line_number = 0;
diff --git a/ACE/apps/JAWS/clients/Caching/test_URL.cpp b/ACE/apps/JAWS/clients/Caching/test_URL.cpp
index 7e81a359f45..1a91ba8c64a 100644
--- a/ACE/apps/JAWS/clients/Caching/test_URL.cpp
+++ b/ACE/apps/JAWS/clients/Caching/test_URL.cpp
@@ -4,7 +4,7 @@
 
 ACE_RCSID(Caching, test_URL, "$Id$")
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_UNUSED_ARG (argc);
   ACE_UNUSED_ARG (argv);
@@ -18,7 +18,7 @@ int main (int argc, char *argv[])
   ouch1[1].value ("value 2");
   ouch1[2].name ("name 3");
   ouch1[2].value ("value 3");
- 
+
   original.url_query (1, ouch1, 3);
 
   original.dump ();
diff --git a/ACE/apps/JAWS/server/main.cpp b/ACE/apps/JAWS/server/main.cpp
index 4f319f02727..dc9d8291549 100644
--- a/ACE/apps/JAWS/server/main.cpp
+++ b/ACE/apps/JAWS/server/main.cpp
@@ -33,7 +33,7 @@ handler (int)
 // JAWS as an ACE Service, as well.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_Service_Config daemon;
 
diff --git a/ACE/apps/JAWS/stress_testing/benchd.cpp b/ACE/apps/JAWS/stress_testing/benchd.cpp
index ff17f669430..657503db009 100644
--- a/ACE/apps/JAWS/stress_testing/benchd.cpp
+++ b/ACE/apps/JAWS/stress_testing/benchd.cpp
@@ -34,7 +34,7 @@ static ACE_HANDLE OUTPUT_FILE;
 class Handle_Events : public ACE_Event_Handler
 {
 public:
-  Handle_Events (u_short udp_port, 
+  Handle_Events (u_short udp_port,
 		 const char *ip_addr,
 		 const char *interface,
 		 ACE_Reactor &reactor);
@@ -77,12 +77,12 @@ Handle_Events::handle_input (ACE_HANDLE h)
 
       // receive message from multicast group
       int retcode = this->mcast_.recv (buf, sizeof buf, remote_addr);
-      
+
       if (retcode != -1)
 	{
           /*
-            cout << "received datagram from host " << remote_addr.get_host_name () 
-            << " on port " << remote_addr.get_port_number () 
+            cout << "received datagram from host " << remote_addr.get_host_name ()
+            << " on port " << remote_addr.get_port_number ()
             << " bytes = " << retcode << endl;
             */
           serve (buf);
@@ -112,7 +112,7 @@ Handle_Events::~Handle_Events (void)
     ACE_OS::perror ("unsubscribe fails"), ACE_OS::exit (1);
 }
 
-Handle_Events::Handle_Events (u_short udp_port, 
+Handle_Events::Handle_Events (u_short udp_port,
 			      const char *ip_addr,
 			      const char *interface,
 			      ACE_Reactor &reactor)
@@ -120,10 +120,10 @@ Handle_Events::Handle_Events (u_short udp_port,
   // Create multicast address to listen on.
 
   ACE_INET_Addr sockmc_addr (udp_port, ip_addr);
-  
+
   // subscribe to multicast group.
 
-  if (this->mcast_.subscribe (sockmc_addr, 1, interface) == -1) 
+  if (this->mcast_.subscribe (sockmc_addr, 1, interface) == -1)
     ACE_OS::perror ("can't subscribe to multicast group"), ACE_OS::exit (1);
 
   // Disable loopbacks.
@@ -204,24 +204,24 @@ handler (int)
   done = 1;
 }
 
-int 
-main (int argc, char *argv[])
+int
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGINT);
   ACE_OS::signal (SIGCLD, SIG_IGN);
   ACE_UNUSED_ARG (sa);
 
   parse_args (argc, argv);
-  
+
   OUTPUT_FILE = ACE_OS::open (OUTPUT_FILE_NAME, O_CREAT | O_WRONLY, 0644);
-  if (OUTPUT_FILE == 0) 
+  if (OUTPUT_FILE == 0)
     return 1;
 
   ACE_Reactor reactor;
   Handle_Events handle_events (UDP_PORT, MCAST_ADDR, INTERFACE, reactor);
 
   // main loop
-	  
+
   while (!done)
     reactor.handle_events ();
 
@@ -230,8 +230,8 @@ main (int argc, char *argv[])
   return 0;
 }
 #else
-int 
-main (int argc, char *argv[])
+int
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_ERROR ((LM_ERROR, "error: %s must be run on a platform that support IP multicast\n",
 	    argv[0]));
diff --git a/ACE/apps/JAWS2/main.cpp b/ACE/apps/JAWS2/main.cpp
index d1bd6f46dcb..1d3198f8ba8 100644
--- a/ACE/apps/JAWS2/main.cpp
+++ b/ACE/apps/JAWS2/main.cpp
@@ -26,7 +26,7 @@ static JAWS_HTTP_10_Parse_Task HTTP_Parse;
 static JAWS_HTTP_10_Write_Task HTTP_Write;
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_OS::signal (SIGCHLD, SIG_IGN);
 
diff --git a/ACE/apps/JAWS3/bench/mkfiles.cpp b/ACE/apps/JAWS3/bench/mkfiles.cpp
index 42bc2c969fa..86f7a06f9a7 100644
--- a/ACE/apps/JAWS3/bench/mkfiles.cpp
+++ b/ACE/apps/JAWS3/bench/mkfiles.cpp
@@ -8,7 +8,7 @@
 static float gammln (float xx);
 static float poidev (float xm);
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_Get_Opt options (argc, argv, "m:s:x:n:");
   // m -- median file size in kB
diff --git a/ACE/apps/JAWS3/bench/rqfiles.cpp b/ACE/apps/JAWS3/bench/rqfiles.cpp
index 49e6bf726d0..14c4923080a 100644
--- a/ACE/apps/JAWS3/bench/rqfiles.cpp
+++ b/ACE/apps/JAWS3/bench/rqfiles.cpp
@@ -161,7 +161,7 @@ typedef ACE_Select_Reactor_T<ACE_Select_Reactor_Noop_Token>
         ACE_Select_NULL_LOCK_Reactor;
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_Select_NULL_LOCK_Reactor *select_reactor;
   select_reactor = new ACE_Select_NULL_LOCK_Reactor;
diff --git a/ACE/apps/drwho/client.cpp b/ACE/apps/drwho/client.cpp
index 5b8f4fcf8ab..bd4c25130b9 100644
--- a/ACE/apps/drwho/client.cpp
+++ b/ACE/apps/drwho/client.cpp
@@ -40,9 +40,9 @@ make_client (void)
                     0);
   return client;
 }
- 
+
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   Options::set_options (argc, argv);
 
@@ -59,7 +59,7 @@ main (int argc, char *argv[])
                        "%p\n",
                        Options::program_name),
                       -1);
-    
+
   sm_client->process ();
 
   return 0;
diff --git a/ACE/apps/drwho/server.cpp b/ACE/apps/drwho/server.cpp
index aa4bea1349b..09bbe570f00 100644
--- a/ACE/apps/drwho/server.cpp
+++ b/ACE/apps/drwho/server.cpp
@@ -86,7 +86,7 @@ do_drwho (SMR_Server &smr_server)
 // debugging!
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_OS::signal (SIGTERM, (ACE_SignalHandler)exit_server);
   ACE_OS::signal (SIGINT, (ACE_SignalHandler)exit_server);
diff --git a/ACE/apps/gperf/src/gperf.cpp b/ACE/apps/gperf/src/gperf.cpp
index de4ca87430d..c6a838e2874 100644
--- a/ACE/apps/gperf/src/gperf.cpp
+++ b/ACE/apps/gperf/src/gperf.cpp
@@ -38,7 +38,7 @@ ACE_RCSID(src, gperf, "$Id$")
 #include "ace/OS_main.h"
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   struct tm *tm;
   time_t clock;
@@ -75,7 +75,7 @@ main (int argc, char *argv[])
 }
 #else  /* ! ACE_HAS_GPERF */
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_UNUSED_ARG (argc);
   ACE_UNUSED_ARG (argv);