1 files changed, 10 insertions, 8 deletions

diff --git a/examples/Reactor/FIFO/server.cpp b/examples/Reactor/FIFO/server.cpp
index 108f51a7ffc..b6e91dd5046 100644
--- a/examples/Reactor/FIFO/server.cpp
+++ b/examples/Reactor/FIFO/server.cpp
@@ -1,6 +1,8 @@
 // $Id$
 
 #include "ace/Service_Config.h"
+#include "ace/Reactor.h"
+#include "ace/Event_Handler.h"
 #include "ace/FIFO_Recv_Msg.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_unistd.h"
@@ -28,12 +30,12 @@ FIFO_Recv_Handler::FIFO_Recv_Handler (void)
   // Make sure to open the FIFO with the "persistent" flag enabled
   // (which is the default).
   if (this->fifo_reader_.open (ACE_DEFAULT_RENDEZVOUS) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "open"));
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("open")));
 
   // Register with the Reactor.
   if (ACE_Reactor::instance ()->register_handler
       (this, ACE_Event_Handler::READ_MASK) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "register_handler"));
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("register_handler")));
 }
 
 ACE_HANDLE
@@ -53,35 +55,35 @@ FIFO_Recv_Handler::handle_input (ACE_HANDLE)
 {
   char buf[BUFSIZ];
 
-  ACE_DEBUG ((LM_DEBUG, "handle_input\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("handle_input\n")));
 
   ACE_Str_Buf msg (buf, 0, sizeof buf);
 
   ssize_t n = this->fifo_reader_.recv (msg);
 
   if (n < 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "recv"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("recv")), -1);
   else
     {
-      ACE_DEBUG ((LM_DEBUG, "msg.len = %d, n = %d\n", msg.len, n));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("msg.len = %d, n = %d\n"), msg.len, n));
 
       if (msg.len > 0)
 	{
 	  // Do some work in here...
-	  ACE_DEBUG ((LM_DEBUG, "msg.buf = %s\n", msg.buf));
+	  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("msg.buf = %C\n"), msg.buf));
 	}
       return 0;
     }
 }
 
 int
-main (int, char *argv[])
+ACE_TMAIN (int, ACE_TCHAR *argv[])
 {
   ACE_Service_Config daemon (argv[0]);
 
   FIFO_Recv_Handler fr_handler;
 
-  ACE_Reactor::run_event_loop ();
+  ACE_Reactor::instance ()->run_reactor_event_loop ();
 
   return 0;
 }