er"

4 files changed, 44 insertions, 9 deletions

diff --git a/ChangeLog-97a b/ChangeLog-97a
index c6a173e64c6..14321189d3d 100644
--- a/ChangeLog-97a
+++ b/ChangeLog-97a
@@ -1,14 +1,12 @@
-Mon Feb 17 09:25:08 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
+Mon Feb 17 18:32:29 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-	* ace/config-linux-lxpthreads.h: Bumped the Linux kernel version
- 	number assigned to the symbol LINUX.  Also added conditional
- 	defines for PTHREAD_{MAX,MIN}_PRIORITY when using Xavier Leroy's
- 	LinuxThreads.
+	* ace/OS.h: Protected the #ifdef for CLOCK_REALTIME so that it
+ 	  won't conflict with an existing macro in AIX.  Thanks to Chris
+ 	  Lahey <CLahey@cccis.com> for this.
 
-	* ace/Thread_Priority.cpp: Added convert_to_os_priority() for Linux.
-	
-
-Mon Feb 17 00:07:47 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+	* ace/Local_Name_Space_T.h: Added Local_Name_Space.h to
+ 	  Local_Name_Space_T.h so that templates will work correctly on
+ 	  AIX.  Thanks to Chris Lahey <CLahey@cccis.com> for this.
 
 	* tests: Added a new test, Reactor_Notify_Test.cpp, which tests
  	  out the new max_notify_iterations() method on the Reactor.
@@ -20,6 +18,15 @@ Mon Feb 17 00:07:47 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
  	  pending in the dispatch_set.  Previously there was no good way
  	  to guard against this.  Now, it should be handled automatically.
 
+Mon Feb 17 09:25:08 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
+
+	* ace/config-linux-lxpthreads.h: Bumped the Linux kernel version
+ 	number assigned to the symbol LINUX.  Also added conditional
+ 	defines for PTHREAD_{MAX,MIN}_PRIORITY when using Xavier Leroy's
+ 	LinuxThreads.
+
+	* ace/Thread_Priority.cpp: Added convert_to_os_priority() for Linux.
+	
 Mon Feb 17 03:15:48 1997  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
 	* tests/SOCK_Test.cpp (server): Changed recv_n() to recv().
diff --git a/Makefile b/Makefile
index 8b0369fe656..a3e9a57b1d0 100644
--- a/Makefile
+++ b/Makefile
@@ -75,6 +75,13 @@ RELEASE_FILES = ACE_wrappers/ACE-categories \
 		ACE_wrappers/performance-tests \
 		ACE_wrappers/tests
 
+RELEASE_LIB_FILES = \
+	        ACE_wrappers/ChangeLog \
+		ACE_wrappers/STL \
+		ACE_wrappers/VERSION \
+		ACE_wrappers/ace \
+		ACE_wrappers/include \
+
 ifeq ($(PWD),)
   PWD := $(shell pwd)
 endif
@@ -96,3 +103,5 @@ cleanrelease:
 
 release:
 	($(TIMESTAMP)cd ..; /bin/rm -f ACE.tar.gz; tar cvf ACE.tar $(RELEASE_FILES); gzip -9 ACE.tar; chmod a+r ACE.tar.gz)
+	(cd ..; /bin/rm -f ACE-lib.tar.gz; tar cvf ACE-lib.tar $(RELEASE_LIB_FILES); gzip -9 ACE-lib.tar; chmod a+r ACE-lib.tar.gz)
+
diff --git a/ace/Local_Name_Space_T.h b/ace/Local_Name_Space_T.h
index df5c1f0f30c..c0e70b6ad22 100644
--- a/ace/Local_Name_Space_T.h
+++ b/ace/Local_Name_Space_T.h
@@ -231,4 +231,7 @@ private:
 #pragma implementation ("Local_Name_Space_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+// Put this here to avoid circular include problems.
+#include "Local_Name_Space.h"
+
 #endif /* ACE_LOCAL_NAME_SPACE_T_H */
diff --git a/apps/Gateway/README b/apps/Gateway/README
index 7cded6e470c..47474414783 100644
--- a/apps/Gateway/README
+++ b/apps/Gateway/README
@@ -71,6 +71,22 @@ To run the tests do the following:
    will print out some diagnostic info and then block awaiting
    connections from the Gateway.
 
+   BTW, if you want to set the port numbers of the Peers from
+   the command-line do the following:
+   
+   a. Change the svc.conf file in the ./Peer/ directory to
+      another name (e.g., foo.conf).  
+      
+   b. Then run the peers in different windows as
+   
+      # Window 1
+      % peerd -p 10003    
+
+      # Window 2
+      % peerd -p 10004
+
+      etc.
+
 4. Start up the Gateway (gatewayd).  This will print out a bunch of
    messages as it reads the config files and connects to all the Peers.
    By default, the Gateway is purely reactive, i.e., it handles