*** empty log message ***

10 files changed, 100 insertions, 35 deletions

diff --git a/ACE-INSTALL.html b/ACE-INSTALL.html
index 1c2be1aa180..9622d449e22 100644
--- a/ACE-INSTALL.html
+++ b/ACE-INSTALL.html
@@ -187,7 +187,19 @@ for help with this port. <P>
 <DD>
      Steve Huston &lt<A HREF="mailto:shuston@riverace.com">shuston@riverace.com</A>&gt
 	has ported ACE to work with UnixWare 2.01 and
-	  its standard C++ compiler.
+	  its standard C++ compiler.<P>
+
+<DT><B>Chorus</B> <BR><BR>
+<DD>
+
+     Wei Chiang &lt<A HREF="mailto:chiang@tele.nokia.fi">chiang@tele.nokia.fi</A>&gt
+	has ported ACE to Chorus 3.1 using GNU G++ 2.7.2.<P>
+
+<DT><B>LynxOS</B> <BR><BR>
+<DD>
+
+     Dave Mayerhoefer &lt<A HREF="mailto:davem@lynx.com">davem@lynx.com</A>&gt
+	has ported ACE to LynxOS 2.5 using GNU G++ 2.7.2.<P>
 
 <DT><STRONG>VxWorks</STRONG> <BR><BR>
 <DD>
@@ -722,14 +734,21 @@ $ACE_ROOT), and then invoke the top-level Makefile with the
 % mkdir build-SunOS5
 % cd build-SunOS5
 % make -f ../Makefile clone
+% (cd ace; ln -s config-sunos5.5-g++.h config.h)
+% (cd include/makeincludes; ln -s platform_sunos5-g++.h platform_macros.GNU)
 % setenv ACE_ROOT $cwd
 % make
 </pre><P>
 
-This will establish a complete tree of links.  When you do a make in
-this directory you will be producing object code that is not stored in
-the same place as the original source tree.  This way, you can easily
-build another platform in a parallel tree structure. <P>
+This will establish a complete tree of links.  Note that you must to
+build a config.h and platform_macros.GNU in cloned directory.  In
+addition, make sure you set your LD_LIBRARY_PATH to
+$ACE_ROOT/ace:$LD_LIBRARY_PATH on SVR4 UNIX platforms. <P>
+
+When you do a make in the $ACE_ROOT directory you will be producing
+object code that is not stored in the same place as the original
+source tree.  This way, you can easily build another platform in a
+parallel tree structure. <P>
 
 <B> VERY IMPORTANT! </B> <P>
 
diff --git a/ChangeLog-97b b/ChangeLog-97b
index 75a90917eda..1d9e27f03fe 100644
--- a/ChangeLog-97b
+++ b/ChangeLog-97b
@@ -1,3 +1,37 @@
+Wed Oct 29 07:39:38 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* ace/LOCK_SOCK_Acceptor.h: Removed the typedef of
+ 	  ACE_SOCK_Acceptor with a full expansion of the name to fix a G++
+ 	  bug.
+
+	* tests/Conn_Test.cpp: Fixed a template instantiation problem.
+
+	* ACE-INSTALL.html: Pointed out that ACE is ported to LynxOS and
+	  Chorus.
+
+	* ACE-INSTALL.html: Added information about cloning that explains
+ 	  how you must to build a config.h and platform_macros.GNU in
+ 	  cloned directory.  Thanks to Arturo for this.
+
+        * bin/Makefile: Added
+ 	  $(ACE_ROOT)/include/makeinclude/platform_macros.GNU to Makefile
+ 	  so we can compile clone on any ACE platform.  Thanks to Arturo
+ 	  for this.
+
+        * include/makefiles: Added new platform file for SCO UNIX with
+ 	  nothreads.  Thanks to Arturo for this.
+
+        * ace: Added new config files for SCO UNIX with nothreads.
+	  Thanks to Arturo for this.
+
+	* apps/JAWS/server/HTTP_Server.cpp: Fixed the typedef for
+ 	  ACE_LOCK_SOCK_Acceptor.  Thanks to Hans Rohnert for reporting
+ 	  this.
+
+	* tests/Conn_Test.cpp: Changed template instantiations from
+ 	  SOCK_ACCEPTOR to LOCK_SOCK_ACCEPTOR.  Thanks to Han Rohnert for
+ 	  reporting this.
+
 Wed Oct 29 02:10:37 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
         * ACE version 4.3.31, released Wed Oct 29 02:10:37 1997.
diff --git a/ace/LOCK_SOCK_Acceptor.cpp b/ace/LOCK_SOCK_Acceptor.cpp
index de63cc7b33f..8c0a1774199 100644
--- a/ace/LOCK_SOCK_Acceptor.cpp
+++ b/ace/LOCK_SOCK_Acceptor.cpp
@@ -12,11 +12,11 @@ ACE_LOCK_SOCK_Acceptor<ACE_LOCK>::accept (ACE_SOCK_Stream &stream,
 {
   ACE_GUARD_RETURN (ACE_LOCK, ace_mon, (ACE_LOCK &) this->lock_, -1);
   
-  return SUPER::accept (stream, 
-                        remote_address, 
-                        timeout, 
-                        restart, 
-                        reset_new_handle);
+  return ACE_SOCK_Acceptor::accept (stream, 
+                                    remote_address, 
+                                    timeout, 
+                                    restart, 
+                                    reset_new_handle);
 }
 
 template <class ACE_LOCK> ACE_LOCK &
diff --git a/ace/LOCK_SOCK_Acceptor.h b/ace/LOCK_SOCK_Acceptor.h
index b6c89f6a4af..6e8888b06b2 100644
--- a/ace/LOCK_SOCK_Acceptor.h
+++ b/ace/LOCK_SOCK_Acceptor.h
@@ -42,9 +42,6 @@ public:
   // Return a reference to the lock.
 
 protected:
-  typedef ACE_SOCK_Acceptor SUPER;
-  // Useful typedef
-
   ACE_LOCK lock_;
   // Type of locking mechanism.
 };
diff --git a/ace/config-fsu-pthread.h b/ace/config-fsu-pthread.h
index f401507fc8d..9e725c9b34d 100644
--- a/ace/config-fsu-pthread.h
+++ b/ace/config-fsu-pthread.h
@@ -28,7 +28,10 @@
 #define	ACE_LACKS_RWLOCK_T
 #define	ACE_LACKS_SETSCHED
 
+#if !defined(ACE_HAS_POSIX_TIME)
+#define	ACE_HAS_POSIX_TIME
 #define	ACE_LACKS_TIMESPEC_T
+#endif
 
 #include <pthread.h>
 
diff --git a/ace/config-sco-5.0.0.h b/ace/config-sco-5.0.0.h
index 50e034852ea..101450ed85b 100644
--- a/ace/config-sco-5.0.0.h
+++ b/ace/config-sco-5.0.0.h
@@ -98,7 +98,7 @@
 #define	ACE_NEEDS_SYSTIME_H
 #define	ACE_LACKS_STRCASECMP
 
-#define	ACE_HAS_POSIX_TIME
+// #define	ACE_HAS_POSIX_TIME
 #define	ACE_HAS_IP_MULTICAST
 
 #endif /* ACE_CONFIG_SCO_5_0_0_H */
diff --git a/apps/JAWS/server/HTTP_Server.cpp b/apps/JAWS/server/HTTP_Server.cpp
index 1ea664a5ac8..0d0cf22ea6c 100644
--- a/apps/JAWS/server/HTTP_Server.cpp
+++ b/apps/JAWS/server/HTTP_Server.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/Asynch_Acceptor.h"
+#include "ace/LOCK_SOCK_Acceptor.h"
 #include "ace/Proactor.h"
 
 #include "IO.h"
@@ -384,8 +385,8 @@ ACE_STATIC_SVC_DEFINE (HTTP_Server, "HTTP_Server", ACE_SVC_OBJ_T,
                        | ACE_Service_Type::DELETE_OBJ, 0)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class LOCK_SOCK_Acceptor<ACE_SYNCH_MUTEX>;
+template class ACE_LOCK_SOCK_Acceptor<ACE_SYNCH_MUTEX>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate LOCK_SOCK_Acceptor<ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_LOCK_SOCK_Acceptor<ACE_SYNCH_MUTEX>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
diff --git a/bin/Makefile b/bin/Makefile
index 8cf17a038f1..b7a6dc9af22 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -4,11 +4,13 @@
 #
 #############################################################################
 
-CXX		= CC
+include $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
+
+# CXX		= gcc 
 CFILES		= clone.cpp 
 OFILES		= clone.o
-DFLAGS		= -g
-CFLAGS		= $(DFLAGS) -I$(ACE_ROOT)
+DFLAGS		= -b elf
+CFLAGS		= $(CCFLAGS) -I$(ACE_ROOT)
 
 #############################################################################
 # C++ directives
diff --git a/include/makeinclude/platform_sco5.0.0-nothread.GNU b/include/makeinclude/platform_sco5.0.0-nothread.GNU
index 8a852efe2f3..106c61d750b 100644
--- a/include/makeinclude/platform_sco5.0.0-nothread.GNU
+++ b/include/makeinclude/platform_sco5.0.0-nothread.GNU
@@ -1,25 +1,34 @@
 # $Id$
 
-# SCO v5.0.2; gcc version 2.7-95q4(Skunkware96 distribution from media images)
-
-debug = 1
-optimize = 1
-
+# Requires FSU pthreads and gcc 2.7.2 installed in /usr/progressive
+# to produce libACE.so correctly changed the specs file for gcc 2.7.2
+# for not link -lc and -lgcc and other not shared libraries
 CC              = gcc
+# for threads
+# for no threads
+#CXX		= gcc -fno-implicit-templates -w -fno-strict-prototypes
+# LDFLAGS	+= -L $(ACE_ROOT)/ace -L ./ ${FSU_PTHREADS_DIR}/init/init.o # -z muldefs
+# LDLIBS	+= -L $(ACE_ROOT)/ace -L ./ ${FSU_PTHREADS_DIR}/init/init.o -lACE # -z muldefs
+LDLIBS	+= -L $(ACE_ROOT)/ace # -z muldefs
 CXX		= g++
-CFLAGS		+= -b elf -w
-CCFLAGS		+= $(CFLAGS) -Xpg4plus -fno-implicit-templates \
-		   -I/usr/progressive/lib/g++-include
+CFLAGS		+= $(DCFLAGS) -b elf -w -O2
+CCFLAGS		+= $(DCCFLAGS) -b elf -O2 -fpic -fno-implicit-templates -I /usr/progressive/lib/g++-include
+#DCFLAGS		+= -gstabs -DACE_HAS_BIG_FD_SET
 DCFLAGS		+= -gstabs
+DCCFLAGS	+= $(DCFLAGS)
 DLD             = $(CXX)
-LD		= $(CXX)
-LIBS            += -lsocket -lnsl -ldl
-OCFLAGS		+= -O2
-PIC             = -fpic 
+LD              = $(CXX)
+LIBS            = -lnsl -lsocket
+PIC             = -fpic
 AR              = ar
 ARFLAGS         = ruv
 RANLIB          = /bin/true
 
-SOFLAGS = $(CPPFLAGS) -b elf -fpic -G
+SOFLAGS = $(CPPFLAGS) -b elf -fpic -G 
 SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
-PRELIB  = @true
+# SOLINK	= $(SOLINK.cc) -o $@ $(LDFLAGS) $<
+# PRELIB  = (echo "main() { }" > gcctemp.c && \
+#           $(COMPILE.cc) -o gcctemp.o gcctemp.c && \
+#           $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(LDLIBS) $(LIBS); \
+#           status=$$?; exit $$status)
+PRELIB = @true
diff --git a/tests/Conn_Test.cpp b/tests/Conn_Test.cpp
index b58cacb1746..25f72294121 100644
--- a/tests/Conn_Test.cpp
+++ b/tests/Conn_Test.cpp
@@ -576,7 +576,7 @@ template class ACE_Hash_Map_Entry<ACE_Hash_Addr<ACE_INET_Addr>, Svc_Handler *>;
 template class ACE_Hash_Map_Iterator<ACE_Hash_Addr<ACE_INET_Addr>, Svc_Handler *, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Manager<ACE_Hash_Addr<ACE_INET_Addr>, Svc_Handler *, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Manager<ACE_Hash_Addr<ACE_INET_Addr>, Svc_Handler *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_LOCK_SOCK_Acceptor<ACCEPTOR_LOCKING> SOCK_ACCEPTOR;
+template class ACE_LOCK_SOCK_Acceptor<ACCEPTOR_LOCKING>;
 template class ACE_Oneshot_Acceptor<Svc_Handler, ACE_SOCK_ACCEPTOR>;
 template class ACE_Map_Entry<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *>;
 template class ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>;
@@ -599,7 +599,7 @@ template class ACE_Auto_Basic_Array_Ptr<pid_t>;
 #pragma instantiate ACE_Hash_Map_Iterator<ACE_Hash_Addr<ACE_INET_Addr>, Svc_Handler *, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Manager<ACE_Hash_Addr<ACE_INET_Addr>, Svc_Handler *, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Manager<ACE_Hash_Addr<ACE_INET_Addr>, Svc_Handler *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_LOCK_SOCK_Acceptor<ACCEPTOR_LOCKING> SOCK_ACCEPTOR;
+#pragma instantiate ACE_LOCK_SOCK_Acceptor<ACCEPTOR_LOCKING>
 #pragma instantiate ACE_Oneshot_Acceptor<Svc_Handler, ACE_SOCK_ACCEPTOR>
 #pragma instantiate ACE_Map_Entry<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *>
 #pragma instantiate ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>