*** empty log message ***

12 files changed, 112 insertions, 78 deletions

diff --git a/ChangeLog-97a b/ChangeLog-97a
index 8328c8ee049..b082aee453f 100644
--- a/ChangeLog-97a
+++ b/ChangeLog-97a
@@ -1,14 +1,30 @@
-Fri May 16 00:02:33 1997    <irfan@TWOSTEP>
+Fri May 16 12:25:32 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-	* ace/ReactorEx: Even though changes to the owner field are very
- 	  well synchronized within the class code, the owner() accessor is
- 	  public and can be called from out side the class. Therefore, I
- 	  have added a owner_i() that does not do locking. All internal
- 	  calls to check the owner will use the new accessor, whereas
- 	  application code outside the class can still use the old
- 	  synchronized accessor.
+	* netsvcs/lib: Added the new Server_Logging_Handler_T.* and
+ 	  Log_Message_Receiver.* netsvcs.  Thanks to Per Andersson for
+ 	  contributing these.
 
-Fri May 16 12:25:32 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
+	* examples/Misc/Makefile: Removed the XtReactor tests from the
+ 	  Makefile until we figure out a good way to get them integrated
+ 	  with the appropriate libraries.
+
+	* ace/config-irix6.2-sgic++-nothread.h: Added the following:
+
+	  ACE_LACKS_LINEBUFFERED_STREAMBUF
+	  ACE_HAS_SETOWN
+	  ACE_HAS_SYSENT_H
+	  ACE_HAS_SYSINFO
+
+	  Thanks to Torbjorn Lindgren <tl@funcom.com> for reporting
+	  this.
+
+	* ace/Proactor.cpp: Changed the use of lock() to mutex() since we
+ 	  changed the name in Timer_Queue.
+
+	* ace/Timer_Queue_T.i: Changed the name of the lock() method to
+ 	  mutex() to work around compile problems with HP/UX.  Thanks to
+ 	  Robert Head <rhead@mail.virtc.com> for reporting this
+ 	  workaround.
 
 	* ace/config-irix5.3-sgic++.h: Made a few changes to get ACE to
  	  work on IRIX 5.3.  Thanks to Eugene R. Somdahl <gene@endo.com>
@@ -32,6 +48,16 @@ Fri May 16 12:25:32 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
  	   nostdinc flag, and removed extra whitespace.  Thanks to Wei
  	   Chiang for reporting this.
 
+Fri May 16 00:02:33 1997 <irfan@TWOSTEP>
+
+	* ace/ReactorEx: Even though changes to the owner field are very
+ 	  well synchronized within the class code, the owner()
+	  accessor is public and can be called from out side the
+	  class. Therefore, I have added a owner_i() that does not do
+	  locking. All internal calls to check the owner will use the
+	  new accessor, whereas application code outside the class can
+	  still use the old synchronized accessor.
+
 Fri May 16 11:39:51 1997  Nanbor Wang  <nw1@cs.wustl.edu>
 
 	* ace/OS.i (sigaddset, sigdelset, sigemptyset, sigfillset,
diff --git a/README b/README
index 710b0fde836..6296145f5f6 100644
--- a/README
+++ b/README
@@ -513,6 +513,7 @@ Tom Dobridge <dobridge@persimmon.com>
 Rich Christy <rchristy@cccis.com>
 Satoshi Ueno <satoshi.ueno@gs.com>
 Eugene R. Somdahl <gene@endo.com>
+Robert Head <rhead@mail.virtc.com>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson and is now at ObjectSpace.  Paul devised the recursive
diff --git a/ace/Proactor.cpp b/ace/Proactor.cpp
index f86a4a45b1d..d886e019dd7 100644
--- a/ace/Proactor.cpp
+++ b/ace/Proactor.cpp
@@ -287,7 +287,7 @@ ACE_Proactor::schedule_timer (ACE_Handler &handler,
   ACE_Time_Value absolute_time = this->timer_queue_->gettimeofday () + time;
   
   // Only one guy goes in here at a time
-  ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->timer_queue_->lock (), -1);  
+  ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->timer_queue_->mutex (), -1);  
 
   // Schedule the timer
   int result = this->timer_queue_->schedule (&handler, 
diff --git a/ace/Timer_Queue_T.h b/ace/Timer_Queue_T.h
index 7c396a624fc..538dd267c45 100644
--- a/ace/Timer_Queue_T.h
+++ b/ace/Timer_Queue_T.h
@@ -226,7 +226,7 @@ public:
   void timer_skew (const ACE_Time_Value &skew);
   const ACE_Time_Value &timer_skew (void) const;
 
-  LOCK &lock (void); 
+  LOCK &mutex (void); 
   // Synchronization variable used by the queue
 
   FUNCTOR &upcall_functor (void);
@@ -258,7 +258,7 @@ protected:
   virtual void free_node (ACE_Timer_Node_T<TYPE, FUNCTOR, LOCK> *) = 0;
   // Factory method that frees a previously allocated node.
 
-  LOCK lock_; 
+  LOCK mutex_; 
   // Synchronization variable for <ACE_Timer_Queue>.
 
   ACE_Time_Value (*gettimeofday_)(void);
diff --git a/ace/Timer_Queue_T.i b/ace/Timer_Queue_T.i
index 4778691bb72..c18bfc26f28 100644
--- a/ace/Timer_Queue_T.i
+++ b/ace/Timer_Queue_T.i
@@ -47,9 +47,9 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, LOCK>::gettimeofday (ACE_Time_Value (*gettimeof
 }
 
 template <class TYPE, class FUNCTOR, class LOCK> LOCK &
-ACE_Timer_Queue_T<TYPE, FUNCTOR, LOCK>::lock (void)
+ACE_Timer_Queue_T<TYPE, FUNCTOR, LOCK>::mutex (void)
 {
-  return this->lock_;
+  return this->mutex_;
 }
 
 template <class TYPE, class FUNCTOR, class LOCK> FUNCTOR &
diff --git a/ace/config-irix6.2-sgic++-nothreads.h b/ace/config-irix6.2-sgic++-nothreads.h
index ca8d98b4a0d..bed586602ab 100644
--- a/ace/config-irix6.2-sgic++-nothreads.h
+++ b/ace/config-irix6.2-sgic++-nothreads.h
@@ -9,6 +9,10 @@
 #define ACE_CONFIG_H
 
 #define ACE_HAS_P_READ_WRITE
+#define ACE_LACKS_LINEBUFFERED_STREAMBUF
+#define ACE_HAS_SETOWN
+#define ACE_HAS_SYSENT_H
+#define ACE_HAS_SYSINFO
 
 // Include XtReactor into the library.
 #define ACE_HAS_XT
diff --git a/examples/Misc/Makefile b/examples/Misc/Makefile
index 91eef0973aa..85130522aab 100644
--- a/examples/Misc/Makefile
+++ b/examples/Misc/Makefile
@@ -14,9 +14,11 @@ BIN     = test_dump \
 	  test_read_buffer \
 	  test_set \
 	  test_sstring \
-	  test_trace \
-	  test_XtReactor1 \
-	  test_XtReactor2
+	  test_trace 
+
+# Uncomment the following if you want to test out the XtReactor.
+#	  test_XtReactor1 \
+#	  test_XtReactor2
 
 LSRC    = $(addsuffix .cpp,$(BIN))
 
diff --git a/netsvcs/lib/Log_Message_Receiver.cpp b/netsvcs/lib/Log_Message_Receiver.cpp
index af47b20bef4..03fccfea3b2 100644
--- a/netsvcs/lib/Log_Message_Receiver.cpp
+++ b/netsvcs/lib/Log_Message_Receiver.cpp
@@ -1,4 +1,4 @@
-#include "Log_Message_Receiver.cpp"
+#include "Log_Message_Receiver.h"
 
 // Type based log message receiver.
 template<ACE_SYNCH_1> void
diff --git a/netsvcs/lib/Makefile b/netsvcs/lib/Makefile
index 87b52e3a80e..3c489ecb139 100644
--- a/netsvcs/lib/Makefile
+++ b/netsvcs/lib/Makefile
@@ -471,7 +471,8 @@ include	$(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU
  $(WRAPPER_ROOT)/ace/Name_Request_Reply.h \
  $(WRAPPER_ROOT)/ace/Name_Space.h
 .obj/Server_Logging_Handler.o .shobj/Server_Logging_Handler.so: Server_Logging_Handler.cpp \
- $(WRAPPER_ROOT)/ace/Get_Opt.h \
+ Server_Logging_Handler.h Server_Logging_Handler_T.h \
+ $(WRAPPER_ROOT)/ace/Synch.h \
  $(WRAPPER_ROOT)/ace/ACE.h \
  $(WRAPPER_ROOT)/ace/OS.h \
  $(WRAPPER_ROOT)/ace/config.h \
@@ -483,9 +484,6 @@ include	$(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU
  $(WRAPPER_ROOT)/ace/Log_Priority.h \
  $(WRAPPER_ROOT)/ace/Log_Record.i \
  $(WRAPPER_ROOT)/ace/ACE.i \
- $(WRAPPER_ROOT)/ace/Get_Opt.i \
- Server_Logging_Handler.h \
- $(WRAPPER_ROOT)/ace/Synch.h \
  $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \
  $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \
  $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \
@@ -576,7 +574,10 @@ include	$(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU
  $(WRAPPER_ROOT)/ace/Task_T.h \
  $(WRAPPER_ROOT)/ace/Task_T.i \
  $(WRAPPER_ROOT)/ace/Svc_Handler.i \
- $(WRAPPER_ROOT)/ace/Acceptor.i
+ $(WRAPPER_ROOT)/ace/Acceptor.i \
+ $(WRAPPER_ROOT)/ace/SString.h \
+ $(WRAPPER_ROOT)/ace/SString.i \
+ Base_Optimizer.h Log_Message_Receiver.h
 .obj/Token_Handler.o .shobj/Token_Handler.so: Token_Handler.cpp \
  $(WRAPPER_ROOT)/ace/Get_Opt.h \
  $(WRAPPER_ROOT)/ace/ACE.h \
diff --git a/netsvcs/lib/Server_Logging_Handler.cpp b/netsvcs/lib/Server_Logging_Handler.cpp
index 4ae8a3e57fa..04c86c6fd8f 100644
--- a/netsvcs/lib/Server_Logging_Handler.cpp
+++ b/netsvcs/lib/Server_Logging_Handler.cpp
@@ -17,76 +17,76 @@ ACE_SVC_FACTORY_DEFINE (ACE_Thr_Server_Logging_Acceptor)
 #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
 
 template class Static_Log_Message_Receiver<ACE_NULL_SYNCH>;
-template class ACE_Acceptor<Null_Synch_Logg_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
-template class ACE_Accept_Strategy<Null_Synch_Logg_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
-template class ACE_Concurrency_Strategy<Null_Synch_Logg_Handler_Static_Receiver>;
-template class ACE_Creation_Strategy<Null_Synch_Logg_Handler_Static_Receiver>;
-template class ACE_Schedule_All_Reactive_Strategy<Null_Synch_Logg_Handler_Static_Receiver>;
-template class ACE_Scheduling_Strategy<Null_Synch_Logg_Handler_Static_Receiver>;
-template class ACE_Strategy_Acceptor<Null_Synch_Logg_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
-template class ACE_Server_Logging_AcceptorT<Null_Synch_Logg_Handler_Static_Receiver, 
+template class ACE_Acceptor<Null_Synch_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
+template class ACE_Accept_Strategy<Null_Synch_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
+template class ACE_Concurrency_Strategy<Null_Synch_Logging_Handler_Static_Receiver>;
+template class ACE_Creation_Strategy<Null_Synch_Logging_Handler_Static_Receiver>;
+template class ACE_Schedule_All_Reactive_Strategy<Null_Synch_Logging_Handler_Static_Receiver>;
+template class ACE_Scheduling_Strategy<Null_Synch_Logging_Handler_Static_Receiver>;
+template class ACE_Strategy_Acceptor<Null_Synch_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
+template class ACE_Server_Logging_Acceptor_T<Null_Synch_Logging_Handler_Static_Receiver, 
                                             Null_Synch_Static_Receiver, 
-                                            ACE_Schedule_All_Reactive_Strategy<Null_Synch_Logg_Handler_Static_Receiver> >;
-template class ACE_Server_Logging_HandlerT<LOGGING_PEER_STREAM, u_long, ACE_NULL_SYNCH, Null_Synch_Static_Receiver>;
+                                            ACE_Schedule_All_Reactive_Strategy<Null_Synch_Logging_Handler_Static_Receiver> >;
+template class ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, u_long, ACE_NULL_SYNCH, Null_Synch_Static_Receiver>;
 template class ACE_Server_Logging_Handler<Null_Synch_Static_Receiver>;
 
 #if defined (ACE_HAS_THREADS) 
   template class Static_Log_Message_Receiver<ACE_LOGGER_SYNCH>;
   template class Log_Message_Receiver<ACE_LOGGER_SYNCH>;
 
-  template class ACE_Acceptor<Synch_Logg_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
-  template class ACE_Acceptor<Synch_Thr_Logg_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
-  template class ACE_Acceptor<Synch_Logg_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
-  template class ACE_Acceptor<Synch_Thr_Logg_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
+  template class ACE_Acceptor<Synch_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
+  template class ACE_Acceptor<Synch_Thr_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
+  template class ACE_Acceptor<Synch_Logging_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
+  template class ACE_Acceptor<Synch_Thr_Logging_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
 
-  template class ACE_Accept_Strategy<Synch_Logg_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
-  template class ACE_Accept_Strategy<Synch_Thr_Logg_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
-  template class ACE_Accept_Strategy<Synch_Logg_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
-  template class ACE_Accept_Strategy<Synch_Thr_Logg_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
+  template class ACE_Accept_Strategy<Synch_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
+  template class ACE_Accept_Strategy<Synch_Thr_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
+  template class ACE_Accept_Strategy<Synch_Logging_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
+  template class ACE_Accept_Strategy<Synch_Thr_Logging_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
 
-  template class ACE_Concurrency_Strategy<Synch_Logg_Handler_Static_Receiver>;
-  template class ACE_Concurrency_Strategy<Synch_Thr_Logg_Handler_Static_Receiver>;
-  template class ACE_Concurrency_Strategy<Synch_Logg_Handler_Receiver>;
-  template class ACE_Concurrency_Strategy<Synch_Thr_Logg_Handler_Receiver>;
+  template class ACE_Concurrency_Strategy<Synch_Logging_Handler_Static_Receiver>;
+  template class ACE_Concurrency_Strategy<Synch_Thr_Logging_Handler_Static_Receiver>;
+  template class ACE_Concurrency_Strategy<Synch_Logging_Handler_Receiver>;
+  template class ACE_Concurrency_Strategy<Synch_Thr_Logging_Handler_Receiver>;
 
-  template class ACE_Creation_Strategy<Synch_Logg_Handler_Static_Receiver>;
-  template class ACE_Creation_Strategy<Synch_Thr_Logg_Handler_Static_Receiver>;
-  template class ACE_Creation_Strategy<Synch_Logg_Handler_Receiver>;
-  template class ACE_Creation_Strategy<Synch_Thr_Logg_Handler_Receiver>;
+  template class ACE_Creation_Strategy<Synch_Logging_Handler_Static_Receiver>;
+  template class ACE_Creation_Strategy<Synch_Thr_Logging_Handler_Static_Receiver>;
+  template class ACE_Creation_Strategy<Synch_Logging_Handler_Receiver>;
+  template class ACE_Creation_Strategy<Synch_Thr_Logging_Handler_Receiver>;
 
-  template class ACE_Schedule_All_Reactive_Strategy<Synch_Logg_Handler_Static_Receiver>;
-  template class ACE_Schedule_All_Reactive_Strategy<Synch_Logg_Handler_Receiver>;
+  template class ACE_Schedule_All_Reactive_Strategy<Synch_Logging_Handler_Static_Receiver>;
+  template class ACE_Schedule_All_Reactive_Strategy<Synch_Logging_Handler_Receiver>;
 
-  template class ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logg_Handler_Static_Receiver>;
-  template class ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logg_Handler_Receiver>;
+  template class ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logging_Handler_Static_Receiver>;
+  template class ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logging_Handler_Receiver>;
 
-  template class ACE_Scheduling_Strategy<Synch_Logg_Handler_Static_Receiver>;
-  template class ACE_Scheduling_Strategy<Synch_Logg_Handler_Receiver>;
-  template class ACE_Scheduling_Strategy<Synch_Thr_Logg_Handler_Static_Receiver>;
-  template class ACE_Scheduling_Strategy<Synch_Thr_Logg_Handler_Receiver>;
+  template class ACE_Scheduling_Strategy<Synch_Logging_Handler_Static_Receiver>;
+  template class ACE_Scheduling_Strategy<Synch_Logging_Handler_Receiver>;
+  template class ACE_Scheduling_Strategy<Synch_Thr_Logging_Handler_Static_Receiver>;
+  template class ACE_Scheduling_Strategy<Synch_Thr_Logging_Handler_Receiver>;
 
-  template class ACE_Strategy_Acceptor<Synch_Logg_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
-  template class ACE_Strategy_Acceptor<Synch_Thr_Logg_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
-  template class ACE_Strategy_Acceptor<Synch_Logg_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
-  template class ACE_Strategy_Acceptor<Synch_Thr_Logg_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
+  template class ACE_Strategy_Acceptor<Synch_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
+  template class ACE_Strategy_Acceptor<Synch_Thr_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
+  template class ACE_Strategy_Acceptor<Synch_Logging_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
+  template class ACE_Strategy_Acceptor<Synch_Thr_Logging_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
 
-  template class ACE_Server_Logging_AcceptorT<Synch_Logg_Handler_Static_Receiver, 
+  template class ACE_Server_Logging_Acceptor_T<Synch_Logging_Handler_Static_Receiver, 
                                               Synch_Static_Receiver, 
-                                              ACE_Schedule_All_Reactive_Strategy<Synch_Logg_Handler_Static_Receiver> >;
-  template class ACE_Server_Logging_AcceptorT<Synch_Thr_Logg_Handler_Static_Receiver, 
+                                              ACE_Schedule_All_Reactive_Strategy<Synch_Logging_Handler_Static_Receiver> >;
+  template class ACE_Server_Logging_Acceptor_T<Synch_Thr_Logging_Handler_Static_Receiver, 
                                               Synch_Static_Receiver, 
-                                              ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logg_Handler_Static_Receiver> >;
-  template class ACE_Server_Logging_AcceptorT<Synch_Logg_Handler_Receiver, 
+                                              ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logging_Handler_Static_Receiver> >;
+  template class ACE_Server_Logging_Acceptor_T<Synch_Logging_Handler_Receiver, 
                                               Synch_Receiver, 
-                                              ACE_Schedule_All_Reactive_Strategy<Synch_Logg_Handler_Receiver> >;
-  template class ACE_Server_Logging_AcceptorT<Synch_Thr_Logg_Handler_Receiver, 
+                                              ACE_Schedule_All_Reactive_Strategy<Synch_Logging_Handler_Receiver> >;
+  template class ACE_Server_Logging_Acceptor_T<Synch_Thr_Logging_Handler_Receiver, 
                                               Synch_Receiver, 
-                                              ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logg_Handler_Receiver> >;
+                                              ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logging_Handler_Receiver> >;
 
-  template class ACE_Server_Logging_HandlerT<LOGGING_PEER_STREAM, u_long, ACE_NULL_SYNCH, Synch_Static_Receiver>;
-  template class ACE_Server_Logging_HandlerT<LOGGING_PEER_STREAM, ACE_LOGGER_COUNTER, ACE_MT_SYNCH, Synch_Static_Receiver>;
-  template class ACE_Server_Logging_HandlerT<LOGGING_PEER_STREAM, u_long, ACE_NULL_SYNCH, Synch_Receiver>;
-  template class ACE_Server_Logging_HandlerT<LOGGING_PEER_STREAM, ACE_LOGGER_COUNTER, ACE_MT_SYNCH, Synch_Receiver>;
+  template class ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, u_long, ACE_NULL_SYNCH, Synch_Static_Receiver>;
+  template class ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, ACE_LOGGER_COUNTER, ACE_MT_SYNCH, Synch_Static_Receiver>;
+  template class ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, u_long, ACE_NULL_SYNCH, Synch_Receiver>;
+  template class ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, ACE_LOGGER_COUNTER, ACE_MT_SYNCH, Synch_Receiver>;
 
   template class ACE_Server_Logging_Handler<Synch_Static_Receiver>;
   template class ACE_Thr_Server_Logging_Handler<Synch_Static_Receiver>;
diff --git a/netsvcs/lib/Server_Logging_Handler.h b/netsvcs/lib/Server_Logging_Handler.h
index fa232af82fc..91d73412955 100644
--- a/netsvcs/lib/Server_Logging_Handler.h
+++ b/netsvcs/lib/Server_Logging_Handler.h
@@ -55,14 +55,14 @@ typedef ACE_Server_Logging_Acceptor_T<Synch_Thr_Logging_Handler_Receiver,
 
 // Define external Acceptor_Ts
 typedef Null_Synch_Logging_Handler_Static_Receiver_Acceptor_T 
-        ACE_Server_Logging_Acceptor_T;
+        ACE_Server_Logging_Acceptor;
 typedef Synch_Thr_Logging_Handler_Static_Receiver_Acceptor_T 
-        ACE_Thr_Server_Logging_Acceptor_T;
+        ACE_Thr_Server_Logging_Acceptor;
 
 //typedef  Synch_Logging_Handler_Receiver_Acceptor_T ACE_Server_Logging_Acceptor_T;
 //typedef  Synch_Thr_Logging_Handler_Receiver_Acceptor_T ACE_Thr_Server_Logging_Acceptor_T;
 
-ACE_SVC_FACTORY_DECLARE (ACE_Server_Logging_Acceptor_T)
-ACE_SVC_FACTORY_DECLARE (ACE_Thr_Server_Logging_Acceptor_T)
+ACE_SVC_FACTORY_DECLARE (ACE_Server_Logging_Acceptor)
+ACE_SVC_FACTORY_DECLARE (ACE_Thr_Server_Logging_Acceptor)
 
 #endif /* SERVER_LOGGING_HANDLER_H */
diff --git a/netsvcs/lib/Server_Logging_Handler_T.h b/netsvcs/lib/Server_Logging_Handler_T.h
index 84936ed11ff..6a31212fe21 100644
--- a/netsvcs/lib/Server_Logging_Handler_T.h
+++ b/netsvcs/lib/Server_Logging_Handler_T.h
@@ -122,7 +122,7 @@ public:
   ACE_Server_Logging_Handler (ACE_Thread_Manager * = 0);
   ACE_Server_Logging_Handler (ACE_Thread_Manager *,
                               LOG_MESSAGE_RECEIVER const &receiver);
-  virtual int open (void *= 0);
+  virtual int open (void * = 0);
 };
 
 #if !defined (ACE_HAS_THREADS)