2 files changed, 8 insertions, 11 deletions
diff --git a/examples/ASX/Event_Server/Event_Server/Options.h b/examples/ASX/Event_Server/Event_Server/Options.h
index 596b2b48cc3..98d36bd8d43 100644
--- a/examples/ASX/Event_Server/Event_Server/Options.h
+++ b/examples/ASX/Event_Server/Event_Server/Options.h
@@ -1,17 +1,15 @@
 /* -*- C++ -*- */
 // $Id$
 
-/* Option manager for Event Server */
-
-#if !defined (DEVICE_OPTIONS_H)
-#define DEVICE_OPTIONS_H
+#if !defined (OPTIONS_H)
+#define OPTIONS_H
 
 #include "ace/OS.h"
 #include "ace/Profile_Timer.h"
 
-#if defined (ACE_HAS_THREADS)
-
 class Options
+  // = TITLE
+  //     Option Singleton for Event Server.
 {
 public:
   static Options *instance (void);
@@ -98,5 +96,4 @@ private:
 };
 
 #include "Options.i"
-#endif /* ACE_HAS_THREADS */
-#endif /* DEVICE_OPTIONS_H */
+#endif /* OPTIONS_H */
diff --git a/examples/ASX/Event_Server/Event_Server/Peer_Router.h b/examples/ASX/Event_Server/Event_Server/Peer_Router.h
index 32d7e85906d..e0cb2d8340a 100644
--- a/examples/ASX/Event_Server/Event_Server/Peer_Router.h
+++ b/examples/ASX/Event_Server/Event_Server/Peer_Router.h
@@ -15,7 +15,7 @@ typedef ACE_HANDLE ROUTING_KEY;
 class Peer_Router;
 class Peer_Router_Context;
 
-class Peer_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_MT_SYNCH>
+class Peer_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_SYNCH>
   // = TITLE
   //     Receive input from a Peer and forward to the appropriate
   //     <Peer_Router>.
@@ -92,7 +92,7 @@ private:
   // Private to ensure dynamic allocation.
 };
 
-class Peer_Router : public ACE_Task<ACE_MT_SYNCH>
+class Peer_Router : public ACE_Task<ACE_SYNCH>
   // = TITLE
   //     This abstract base class provides mechanisms for routing
   //     messages to/from a ACE_Stream from/to one or more peers (which
@@ -113,7 +113,7 @@ protected:
   Peer_Router_Context *context (void) const;
   // Returns the routing context.
 
-  typedef ACE_Task<ACE_MT_SYNCH> inherited;
+  typedef ACE_Task<ACE_SYNCH> inherited;
   // Helpful typedef.
 
 private: