5 files changed, 7 insertions, 7 deletions
diff --git a/examples/Reactor/Misc/notification.cpp b/examples/Reactor/Misc/notification.cpp
index a04663b28ad..e276791fc47 100644
--- a/examples/Reactor/Misc/notification.cpp
+++ b/examples/Reactor/Misc/notification.cpp
@@ -377,7 +377,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 }
 #else
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR_RETURN ((LM_ERROR,
 		     "threads must be supported to run this application\n"), -1);
diff --git a/examples/Reactor/Misc/pingpong.cpp b/examples/Reactor/Misc/pingpong.cpp
index f4a3bc0630e..803b98c24cd 100644
--- a/examples/Reactor/Misc/pingpong.cpp
+++ b/examples/Reactor/Misc/pingpong.cpp
@@ -53,7 +53,7 @@ ACE_RCSID(Misc, pingpong, "$Id$")
 class Ping_Pong : public ACE_Test_and_Set<ACE_Null_Mutex, sig_atomic_t>
 {
 public:
-  Ping_Pong (char b[], ACE_HANDLE f);
+  Ping_Pong (const char* b, ACE_HANDLE f);
   virtual ACE_HANDLE get_handle (void) const;
   virtual int handle_input (ACE_HANDLE);
   virtual int handle_output (ACE_HANDLE);
@@ -75,7 +75,7 @@ private:
   // Open handle.
 };
 
-Ping_Pong::Ping_Pong (char b[], ACE_HANDLE f)
+Ping_Pong::Ping_Pong (const char* b, ACE_HANDLE f)
   : buflen_ (ACE_OS::strlen (b) + 1 + (2 * sizeof (int))),
     pid_ (ACE_OS::getpid ()),
     handle_ (f)
@@ -198,7 +198,7 @@ run_svc (ACE_HANDLE handle)
 {
   Ping_Pong *callback = 0;
   ACE_NEW (callback,
-           Ping_Pong (ACE_TEXT_ALWAYS_CHAR (string_name),
+           Ping_Pong (ACE_TEXT_TO_CHAR_IN (string_name),
                       handle));
 
   ACE_Reactor reactor;
diff --git a/examples/Reactor/Misc/test_reactors.cpp b/examples/Reactor/Misc/test_reactors.cpp
index a08580672e0..1676703118e 100644
--- a/examples/Reactor/Misc/test_reactors.cpp
+++ b/examples/Reactor/Misc/test_reactors.cpp
@@ -187,7 +187,7 @@ ACE_TMAIN (int, ACE_TCHAR *[])
 
 #else
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
   return 0;
diff --git a/examples/Reactor/Misc/test_signals_2.cpp b/examples/Reactor/Misc/test_signals_2.cpp
index 466ab58482f..00886ed6549 100644
--- a/examples/Reactor/Misc/test_signals_2.cpp
+++ b/examples/Reactor/Misc/test_signals_2.cpp
@@ -282,7 +282,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *[])
 }
 #else
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR_RETURN ((LM_ERROR,
                      "The HP C++ compiler is too lame to support this feature\n"),
diff --git a/examples/Reactor/Misc/test_time_value.cpp b/examples/Reactor/Misc/test_time_value.cpp
index a1c1c874b78..6557a0716de 100644
--- a/examples/Reactor/Misc/test_time_value.cpp
+++ b/examples/Reactor/Misc/test_time_value.cpp
@@ -23,7 +23,7 @@ operator<< (ostream &stream, const ACE_Time_Value &tv)
 }
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_Time_Value tv1;
   ACE_Time_Value tv2 (2);