ChangeLogTag: Tue Feb 15 21:27:25 2005 Olli Savia <ops@iki.fi>

6 files changed, 141 insertions, 138 deletions

diff --git a/ChangeLog b/ChangeLog
index ca2d0b1ae51..1ddd4a598eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,23 @@
+Tue Feb 15 21:27:25 2005  Olli Savia  <ops@iki.fi>
+
+        * ace/config-lynxos.h:
+        * include/makeinclude/platform_lynxos.GNU:
+          Updated. Utilize new ACE_LYNXOS_* macros, removed some ancient
+          settings etc.
+        
+        * examples/APG/ThreadPools/LF_ThreadPool.cpp:
+        * examples/APG/ThreadPools/ThreadPool.cpp:
+          Replaced NULL with 0.
+
+        * tests/Reactor_Dispatch_Order_Test.cpp:
+          Utilize new ACE_LYNXOS_* macros to differentiate LynxOS
+          versions.
+        
 Tue Feb 15 10:23:39 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
-	* examples/Service_Configurator/Misc/Timer_Service.cpp (handle_close): 
-	  Make sure to cancel the timer when we're done.  Thanks to Scott
- 	  Z <sz@finsatconsulting.com> for reporting this.
+        * examples/Service_Configurator/Misc/Timer_Service.cpp (handle_close):
+          Make sure to cancel the timer when we're done.  Thanks to Scott
+          Z <sz@finsatconsulting.com> for reporting this.
 
 Tue Feb 15 11:11:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -17,96 +32,96 @@ Tue Feb 15 11:07:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Mon Feb 14 20:19:35 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-	* protocols/ace/RMCast/Socket.h (Socket):
+        * protocols/ace/RMCast/Socket.h (Socket):
 
-	  Export this class in the shared library case.  Addresses
-	  link-time errors in MS Windows builds.
+          Export this class in the shared library case.  Addresses
+          link-time errors in MS Windows builds.
 
 Mon Feb 14 18:45:28 2005  Steve Huston  <shuston@riverace.com>
 
-	* protocols/ace/RMCast/Acknowledge.{h cpp}:
-	* protocols/ace/RMCast/Link.h:
-	* protocols/ace/RMCast/Protocol.{h cpp}:
-	* protocols/ace/RMCast/Retransmit.{h cpp}:
-	* protocols/ace/RMCast/Simulator.{h cpp}:
-	* protocols/ace/RMCast/Socket.{h cpp}:
-	* protocols/ace/RMCast/Stack.{h cpp}:
-	  Get RMCast's includes by #include "file.h", not
-	  #include <ace/RMCast/file.h>.
+        * protocols/ace/RMCast/Acknowledge.{h cpp}:
+        * protocols/ace/RMCast/Link.h:
+        * protocols/ace/RMCast/Protocol.{h cpp}:
+        * protocols/ace/RMCast/Retransmit.{h cpp}:
+        * protocols/ace/RMCast/Simulator.{h cpp}:
+        * protocols/ace/RMCast/Socket.{h cpp}:
+        * protocols/ace/RMCast/Stack.{h cpp}:
+          Get RMCast's includes by #include "file.h", not
+          #include <ace/RMCast/file.h>.
 
 Mon Feb 14 18:24:19 2005  Steve Huston  <shuston@riverace.com>
 
-	* ace/OS_TLI.inl: Added "namespace ACE_OS" around all the methods,
-	  instead of prepending ACE_OS to the names. This continues some
-	  similar changes, such as to OS_NS_signal.inl.
-
-	* apps/JAWS3/jaws3/Asynch_IO.h:
-	* apps/JAWS3/jaws3/Asynch_IO_Helpers.h:
-	* apps/JAWS3/jaws3/Concurrency_T.h:
-	* apps/JAWS3/jaws3/Event_Dispatcher.h:
-	* apps/JAWS3/jaws3/Options.h:
-	* apps/JAWS3/jaws3/Reactive_IO.h:
-	* apps/JAWS3/jaws3/Reactive_IO_Helpers.h:
-	* apps/JAWS3/jaws3/Signal_Task.h:
-	* apps/JAWS3/jaws3/Synch_IO.h:
-	  Removed #include "ace/OS.h", replacing with other #includes
-	  as needed. If OS.h is included, some other OS_*.h files can get
-	  pulled in and sometimes ends up tentatively defining structs in
-	  ACE_OS's namespace. This can end up tripping HP-UX aCC. Not sure
-	  why it's only aCC and not other compilers as well, but there it is.
-	  Finally resolves some nagging compile errors on HP-UX.
-
-	* apps/JAWS3/jaws3/Concurrency.cpp:
-	* apps/JAWS3/jaws3/IO.cpp: Add missing OS_NS_* defines
-	  necessitated by no longer including OS.h.
+        * ace/OS_TLI.inl: Added "namespace ACE_OS" around all the methods,
+          instead of prepending ACE_OS to the names. This continues some
+          similar changes, such as to OS_NS_signal.inl.
+
+        * apps/JAWS3/jaws3/Asynch_IO.h:
+        * apps/JAWS3/jaws3/Asynch_IO_Helpers.h:
+        * apps/JAWS3/jaws3/Concurrency_T.h:
+        * apps/JAWS3/jaws3/Event_Dispatcher.h:
+        * apps/JAWS3/jaws3/Options.h:
+        * apps/JAWS3/jaws3/Reactive_IO.h:
+        * apps/JAWS3/jaws3/Reactive_IO_Helpers.h:
+        * apps/JAWS3/jaws3/Signal_Task.h:
+        * apps/JAWS3/jaws3/Synch_IO.h:
+          Removed #include "ace/OS.h", replacing with other #includes
+          as needed. If OS.h is included, some other OS_*.h files can get
+          pulled in and sometimes ends up tentatively defining structs in
+          ACE_OS's namespace. This can end up tripping HP-UX aCC. Not sure
+          why it's only aCC and not other compilers as well, but there it is.
+          Finally resolves some nagging compile errors on HP-UX.
+
+        * apps/JAWS3/jaws3/Concurrency.cpp:
+        * apps/JAWS3/jaws3/IO.cpp: Add missing OS_NS_* defines
+          necessitated by no longer including OS.h.
 
 Mon Feb 14 17:36:43 2005  Steve Huston  <shuston@riverace.com>
 
-	* ace/ace.mwc: Removed RMCast and TMCast, since they're now under
-	  protocols/ace.
+        * ace/ace.mwc: Removed RMCast and TMCast, since they're now under
+          protocols/ace.
 
-	* ace/Makefile.am:
-	* protocols/ace/Makefile.am: Moved RMCast and TMCast entries from
-	  the former to the latter.
+        * ace/Makefile.am:
+        * protocols/ace/Makefile.am: Moved RMCast and TMCast entries from
+          the former to the latter.
 
 Mon Feb 14 17:03:11 2005  Steve Huston  <shuston@riverace.com>
 
-	* ace/RMCast/Acknowledge.cpp:
-	* ace/RMCast/Acknowledge.h:
-	* ace/RMCast/Agent.tar.bz2:
-	* ace/RMCast/Bits.h:
-	* ace/RMCast/Link.cpp:
-	* ace/RMCast/Link.h:
-	* ace/RMCast/Protocol.cpp:
-	* ace/RMCast/Protocol.h:
-	* ace/RMCast/RMCast.mpc:
-	* ace/RMCast/Retransmit.cpp:
-	* ace/RMCast/Retransmit.h:
-	* ace/RMCast/Simulator.cpp:
-	* ace/RMCast/Simulator.h:
-	* ace/RMCast/Socket.cpp:
-	* ace/RMCast/Socket.h:
-	* ace/RMCast/Stack.cpp:
-	* ace/RMCast/Stack.h:
-	  Moved from ace/RMCast to protocols/ace/RMCast.
-
-	* ace/TMCast/ACE_TMCast.pc.in:
-	* ace/TMCast/Export.hpp:
-	* ace/TMCast/FaultDetector.hpp:
-	* ace/TMCast/Group.cpp:
-	* ace/TMCast/Group.hpp:
-	* ace/TMCast/GroupFwd.hpp:
-	* ace/TMCast/LinkListener.hpp:
-	* ace/TMCast/MTQueue.cpp:
-	* ace/TMCast/MTQueue.hpp:
-	* ace/TMCast/Makefile.am:
-	* ace/TMCast/Messaging.hpp:
-	* ace/TMCast/Protocol.cpp:
-	* ace/TMCast/Protocol.hpp:
-	* ace/TMCast/README:
-	* ace/TMCast/TMCast.mpc:
-	* ace/TMCast/TransactionController.hpp:
-	  Moved from ace/TMCast to protocols/ace/TMCast.
+        * ace/RMCast/Acknowledge.cpp:
+        * ace/RMCast/Acknowledge.h:
+        * ace/RMCast/Agent.tar.bz2:
+        * ace/RMCast/Bits.h:
+        * ace/RMCast/Link.cpp:
+        * ace/RMCast/Link.h:
+        * ace/RMCast/Protocol.cpp:
+        * ace/RMCast/Protocol.h:
+        * ace/RMCast/RMCast.mpc:
+        * ace/RMCast/Retransmit.cpp:
+        * ace/RMCast/Retransmit.h:
+        * ace/RMCast/Simulator.cpp:
+        * ace/RMCast/Simulator.h:
+        * ace/RMCast/Socket.cpp:
+        * ace/RMCast/Socket.h:
+        * ace/RMCast/Stack.cpp:
+        * ace/RMCast/Stack.h:
+          Moved from ace/RMCast to protocols/ace/RMCast.
+
+        * ace/TMCast/ACE_TMCast.pc.in:
+        * ace/TMCast/Export.hpp:
+        * ace/TMCast/FaultDetector.hpp:
+        * ace/TMCast/Group.cpp:
+        * ace/TMCast/Group.hpp:
+        * ace/TMCast/GroupFwd.hpp:
+        * ace/TMCast/LinkListener.hpp:
+        * ace/TMCast/MTQueue.cpp:
+        * ace/TMCast/MTQueue.hpp:
+        * ace/TMCast/Makefile.am:
+        * ace/TMCast/Messaging.hpp:
+        * ace/TMCast/Protocol.cpp:
+        * ace/TMCast/Protocol.hpp:
+        * ace/TMCast/README:
+        * ace/TMCast/TMCast.mpc:
+        * ace/TMCast/TransactionController.hpp:
+          Moved from ace/TMCast to protocols/ace/TMCast.
 
 Mon Feb 14 21:34:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -126,30 +141,30 @@ Mon Feb 14 23:08:52 2005  Olli Savia  <ops@iki.fi>
 
 Mon Feb 14 12:17:06 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-	* ace/RMCast/Link.cpp:
+        * ace/RMCast/Link.cpp:
 
-	  Include "ace/OS_NS_sys_socket.h" to pull in ACE_OS::connect()
-	  prototype.
+          Include "ace/OS_NS_sys_socket.h" to pull in ACE_OS::connect()
+          prototype.
 
-	* ace/RMCast/Protocol.h:
+        * ace/RMCast/Protocol.h:
 
-	  Include "ace/OS_NS_string.h" to pull in ACE_OS::memcpy()
-	  prototype.
+          Include "ace/OS_NS_string.h" to pull in ACE_OS::memcpy()
+          prototype.
 
 Mon Feb 14 11:59:27 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-	* ace/RMCast/Protocol.h (id):
-	* ace/RMCast/Protocol.cpp (id):
+        * ace/RMCast/Protocol.h (id):
+        * ace/RMCast/Protocol.cpp (id):
 
-	  Moved static constant initialization out of class declaration.
-	  MSVC++ 6 cannot handle in-class static constant initialization.
-	  Thanks to Chad Elliot for pointing the problem.
+          Moved static constant initialization out of class declaration.
+          MSVC++ 6 cannot handle in-class static constant initialization.
+          Thanks to Chad Elliot for pointing the problem.
 
-	* ace/RMCast/Link.cpp (recv):
+        * ace/RMCast/Link.cpp (recv):
 
-	  Changed the "switch" expression to an "if/else" expression since
-	  the actual values of the cases are no longer available to the
-	  compiler when compiling this file.
+          Changed the "switch" expression to an "if/else" expression since
+          the actual values of the cases are no longer available to the
+          compiler when compiling this file.
 
 Mon Feb 14 20:37:56 2005  Olli Savia  <ops@iki.fi>
 
diff --git a/ace/config-lynxos.h b/ace/config-lynxos.h
index 2183ebf1d3d..a9394f87cdb 100644
--- a/ace/config-lynxos.h
+++ b/ace/config-lynxos.h
@@ -14,8 +14,6 @@
 #define ACE_CONFIG_H
 #include /**/ "ace/pre.h"
 
-#include <unistd.h> /* Get _POSIX_VERSION macro */
-
 #if ! defined (__ACE_INLINE__)
 # define __ACE_INLINE__
 #endif /* ! __ACE_INLINE__ */
@@ -24,7 +22,7 @@
 # include "ace/config-g++-common.h"
 #endif /* __GNUG__ */
 
-#if _POSIX_VERSION >= 199506L
+#if ACE_LYNXOS_MAJOR > 3 || (ACE_LYNXOS_MAJOR == 3 && ACE_LYNXOS_MINOR > 0)
   // LynxOS 3.1.0 or greater need ipc_1c.h to be included before net/if.h
   // to avoid macro conflict.
 # define ACE_NEEDS_IPC_1C_H
@@ -125,14 +123,14 @@
 #if ACE_MT_SAFE == 1
   // Platform supports threads.
 # define ACE_HAS_PTHREADS
-# if _POSIX_VERSION >= 199506L
+# if ACE_LYNXOS_MAJOR > 3 || (ACE_LYNXOS_MAJOR == 3 && ACE_LYNXOS_MINOR > 0)
     /* LynxOS 3.1.0 or greater */
 #   define ACE_HAS_PTHREADS_STD
 # else  /* LynxOS < 3.1.0 */
 #   define ACE_HAS_PTHREADS_DRAFT4
 #   define ACE_HAS_STDARG_THR_DEST
 #   define ACE_LACKS_MUTEXATTR_PSHARED
-    // Without TSS emulation, you'll only have 3 native TSS keys, on
+    // Without TSS emulation, you'll only have 3 native TSS keys on 
     // LynxOS 3.0.0/ppc.
 #   define ACE_HAS_TSS_EMULATION
 # endif /* LynxOS < 3.1.0 */
@@ -148,8 +146,7 @@
 
 #define ACE_HAS_AIO_CALLS
 #define ACE_POSIX_AIOCB_PROACTOR
-// AIOCB Proactor works on Lynx. But it is not
-// multi-threaded.
+// AIOCB Proactor works on Lynx. But it is not multi-threaded.
 // Lynx OS 3.0.0 lacks POSIX call <pthread_sigmask>. So,we cannot use
 // SIG Proactor also, with multiple threads. So, let us use the AIOCB
 // Proactor. Once <pthreadd_sigmask> is available on Lynx, we can turn
@@ -164,13 +161,13 @@
 #define ACE_HAS_USING_KEYWORD
 
 #if __GNUC__ == 2  &&  __GNUC_MINOR__ == 9
-   // config-g++-common.h defines these incorrectly for LynxOS 3.x
-   // with G++ version 2.9-gnupro-98r2
-#  define ACE_HAS_STD_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-#  define ACE_HAS_STD_TEMPLATE_SPECIALIZATION
-#  define ACE_HAS_TEMPLATE_SPECIALIZATION
-#  define ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION
-#  undef ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
+  // config-g++-common.h defines these incorrectly for LynxOS 3.x
+  // with G++ version 2.9-gnupro-98r2
+# define ACE_HAS_STD_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+# define ACE_HAS_STD_TEMPLATE_SPECIALIZATION
+# define ACE_HAS_TEMPLATE_SPECIALIZATION
+# define ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION
+# undef ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
 #endif /* __GNUC__ == 2  &&  __GNUC_MINOR__ == 9 */
 
 // By default, don't include RCS Id strings in object code.
@@ -181,19 +178,15 @@
 // System include files are not in sys/, this gets rid of warning.
 #define __NO_INCLUDE_WARN__
 
-// socket.h from LynxOS 4.0.x defines SOCK_MAXADDRLEN.  Versions
-// of socket.h found on earlier releases of LynxOS do not define it.
-#include <socket.h>
-#if _POSIX_VERSION >= 199506L && defined (SOCK_MAXADDRLEN)
-
-// "changes signedness" error (OS.i and many other files)
+#if ACE_LYNXOS_MAJOR > 3 /* LynxOS 4.x */
+  // "changes signedness" error (OS.i and many other files)
 # define ACE_HAS_SOCKLEN_T
-
-// LSOCK.cpp uses a macro from param.h, not included
+  // LSOCK.cpp uses a macro from param.h, not included
 # define ALIGNBYTES (sizeof(int) - 1)
 # define ALIGN(p) (((unsigned)p + ALIGNBYTES) & ~ALIGNBYTES)
-
-#endif /* _POSIX_VERSION && SOCK_MAXADDRLEN */
+#else /* LynxOS 3.x */
+# define ACE_LACKS_AUTO_PTR
+#endif /* ACE_LYNXOS_MAJOR > 3 */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/examples/APG/ThreadPools/LF_ThreadPool.cpp b/examples/APG/ThreadPools/LF_ThreadPool.cpp
index 79540435f96..2e85ed41b3c 100644
--- a/examples/APG/ThreadPools/LF_ThreadPool.cpp
+++ b/examples/APG/ThreadPools/LF_ThreadPool.cpp
@@ -99,7 +99,7 @@ LF_ThreadPool::svc (void)
     {
       become_leader ();  // Block until this thread is the leader.
 
-      ACE_Message_Block *mb = NULL;
+      ACE_Message_Block *mb = 0;
       ACE_Time_Value tv (LONG_TIME);
       tv += ACE_OS::gettimeofday ();
 
diff --git a/examples/APG/ThreadPools/ThreadPool.cpp b/examples/APG/ThreadPools/ThreadPool.cpp
index cfcfcee8b58..cecee873820 100644
--- a/examples/APG/ThreadPools/ThreadPool.cpp
+++ b/examples/APG/ThreadPools/ThreadPool.cpp
@@ -102,7 +102,7 @@ public:
 
     while (!done ())
       {
-        ACE_Message_Block *mb = NULL;
+        ACE_Message_Block *mb = 0;
         ACE_Time_Value tv ((long)MAX_TIMEOUT);
         tv += ACE_OS::time (0);
 
@@ -188,7 +188,7 @@ Manager::shut_down (void)
   ACE_TRACE (ACE_TEXT ("Manager::shut_down"));
   ACE_Unbounded_Queue<Worker* >::ITERATOR iter =
     this->workers_.begin ();
-  Worker **worker_ptr = NULL;
+  Worker **worker_ptr = 0;
   do
     {
       iter.next (worker_ptr);
diff --git a/include/makeinclude/platform_lynxos.GNU b/include/makeinclude/platform_lynxos.GNU
index 9b05a88b07b..81f7c1f7e4e 100644
--- a/include/makeinclude/platform_lynxos.GNU
+++ b/include/makeinclude/platform_lynxos.GNU
@@ -15,10 +15,6 @@
 #### Similarly, the default VERSION and HOST_OS settings (see below)
 #### can be overridden for your particular platform.
 
-
-ifeq ($(debug),)
-  debug = 1
-endif
 ifeq ($(shared_libs_only),1)
   shared_libs = 1
   static_libs =
@@ -29,6 +25,7 @@ ifeq ($(static_libs_only),1)
 endif
 
 optimize ?= 1
+debug ?= 1
 pipes ?= 1
 
 ifeq ($(shell uname -s),LynxOS)
@@ -36,8 +33,6 @@ ifeq ($(shell uname -s),LynxOS)
 else
   CROSS-COMPILE = 1
 
-  PACE_SYSNAME = LynxOS
-
   #### The following may need to be customized for your host or target type.
   #### Or, you can source the appropriate (for your shell) Lynx SETUP file
   #### before running "make".
@@ -46,8 +41,6 @@ else
     export VERSION=3.0.0
   endif # VERSION
 
-  PACE_SYSVER = 0x$(VERSION)
-
   ifeq (,$(LYNXTARGET))
     export LYNXTARGET = x86
   endif # LYNXTARGET
@@ -96,13 +89,15 @@ PLATFORM_X11_CPPFLAGS=
 PLATFORM_X11_LIBS=-lXpm -lXext -lX11 -lSM -lICE
 PLATFORM_X11_LDFLAGS=
 
-PLATFORM_TCL_CPPFLAGS=-I/usr/include/tcl8.4
-PLATFORM_TCL_LIBS=-ltcl8.4
-PLATFORM_TCL_LDFLAGS=
+ifeq ($(LYNXOS_MAJOR),4)
+  PLATFORM_TCL_CPPFLAGS=-I/usr/include/tcl8.4
+  PLATFORM_TCL_LIBS=-ltcl8.4
+  PLATFORM_TCL_LDFLAGS=
 
-PLATFORM_TK_CPPFLAGS=-I$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS)
-PLATFORM_TK_LIBS=$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_LIB_FLAG)
-PLATFORM_TK_LDFLAGS=
+  PLATFORM_TK_CPPFLAGS=-I$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS)
+  PLATFORM_TK_LIBS=$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_LIB_FLAG)
+  PLATFORM_TK_LDFLAGS=
+endif
 
 CC              = gcc
 CXX             = g++
diff --git a/tests/Reactor_Dispatch_Order_Test.cpp b/tests/Reactor_Dispatch_Order_Test.cpp
index e3241e07233..98973cb34da 100644
--- a/tests/Reactor_Dispatch_Order_Test.cpp
+++ b/tests/Reactor_Dispatch_Order_Test.cpp
@@ -103,14 +103,14 @@ Handler::handle_output (ACE_HANDLE)
               "Handler::handle_output\n"));
 
 #if defined (__OpenBSD__) || \
-	defined (ACE_VXWORKS) || \
-  ( defined (__Lynx__) && _POSIX_VERSION <= 199506L ) // LynxOS 3.x
+    defined (ACE_VXWORKS) || \
+  ( defined (ACE_LYNXOS_MAJOR) && (ACE_LYNXOS_MAJOR < 4) ) // LynxOS 3.x
   // All that we need written has been written, so don't
   // call handle_output again.
   this->reactor ()->mask_ops (this->pipe_.read_handle (),
                               ACE_Event_Handler::WRITE_MASK,
                               ACE_Reactor::CLR_MASK);
-#endif /* __OpenBSD__ || __Lynx__ ... */
+#endif /* __OpenBSD__ || ACE_VXWORKS || ACE_LYNXOS_MAJOR ... */
 
   return 0;
 }