*** empty log message ***

5 files changed, 59 insertions, 25 deletions

diff --git a/ChangeLog-97b b/ChangeLog-97b
index 5a2faaf6896..9b8f939d100 100644
--- a/ChangeLog-97b
+++ b/ChangeLog-97b
@@ -1,3 +1,36 @@
+Thu Oct 30 17:49:56 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
+
+	* ace/Synch_T.i (ACE_TSS): Added a missing ':' that was causing
+ 	  problems on platforms that lack threads.  Thanks to Laura
+ 	  Paterno <lpaterno@d0chb.fnal.gov> for helping to track this
+ 	  down.
+
+	* ace/Signal.cpp (register_handler): Make sure not to use
+ 	  SA_SIGINFO if we're running on LynxOS.  At some point, we'll
+ 	  want to generalize this, once enough OS platforms support POSIX
+ 	  real-time signals.  Thanks to Kirill.Rybaltchenko
+ 	  <Kirill.Rybaltchenko@cern.ch> for reporting this.
+
+	* include/makeinclude/platform_chorus.GNU (CXX): Replaced
+	  DCFLAGS += -g with DCFLAGS += -gstabs+.  Thanks to
+	  Wei Chiang for this.
+
+	* ace/OS.cpp: It's not valid to set the NULL_key to anything other
+ 	  than implicit initialization.  In particular, if we set it to -1
+ 	  it breaks on pthreads systems...  Thanks to Check Gehr for
+	  reporting this.
+
+	* ace/config-irix5.3*++.h: Added ACE_NEEDS_SYSTIME_H.  Thanks to
+ 	  Laura Paterno <lpaterno@d0chb.fnal.gov> for reporting the
+ 	  problem.
+
+	* ace/OS.h: Moved the unistd.h files back down to where
+	  they originally were defined since this was unnecessary.
+
+	* include/makeinclude/platform_chorus.GNU (CXX): Replaced
+	  DCFLAGS += -g with DCFLAGS += -gstabs+.  Thanks to
+	  Wei Chiang for this.
+
 Thu Oct 30 17:41:19 1997  James C Hu  <jxh@lambada.cs.wustl.edu>
 
 	* ace/OS.h: Stray semi-colon removed from ACE_CLASS_IS_NAMESPACE
@@ -38,30 +71,6 @@ Thu Oct 30 10:50:21 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
  	  ACE_LACKS_POSIX_SOME_PROTOTYPES to
  	  ACE_LACKS_SOME_POSIX_PROTOTYPES.
 
-Thu Oct 30 07:02:03 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* include/makeinclude/platform_chorus.GNU (CXX): Replaced
-	  DCFLAGS += -g with DCFLAGS += -gstabs+.  Thanks to
-	  Wei Chiang for this.
-
-Thu Oct 30 07:02:03 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* ace/OS.cpp: It's not valid to set the NULL_key to anything other
- 	  than implicit initialization.  In particular, if we set it to -1
- 	  it breaks on pthreads systems...  Thanks to Check Gehr for
-	  reporting this.
-
-	* ace/config-irix5.3*++.h: Added ACE_NEEDS_SYSTIME_H.  Thanks to
- 	  Laura Paterno <lpaterno@d0chb.fnal.gov> for reporting the
- 	  problem.
-
-	* ace/OS.h: Moved the unistd.h files back down to where
-	  they originally were defined since this was unnecessary.
-
-	* include/makeinclude/platform_chorus.GNU (CXX): Replaced
-	  DCFLAGS += -g with DCFLAGS += -gstabs+.  Thanks to
-	  Wei Chiang for this.
-
 Thu Oct 30 06:14:58 1997  David L. Levine  <levine@cs.wustl.edu>
 
         * Makefile,ACE-INSTALL: removed ACE-INSTALL from CVS control.
diff --git a/ace/Signal.cpp b/ace/Signal.cpp
index 794f7de1dbe..0f62771f5e4 100644
--- a/ace/Signal.cpp
+++ b/ace/Signal.cpp
@@ -257,7 +257,9 @@ ACE_Sig_Handler::register_handler (int signum,
         new_disp = &sa;
 
       new_disp->handler (ace_signal_handler_dispatcher);
+#if !defined (ACE_HAS_LYNXOS_SIGNALS)
       new_disp->flags (new_disp->flags () | SA_SIGINFO);
+#endif /* ACE_HAS_LYNXOS_SIGNALS */
       return new_disp->register_action (signum, old_disp);
     }
   else
diff --git a/ace/Signal.h b/ace/Signal.h
index 0ff414e3800..4624394272e 100644
--- a/ace/Signal.h
+++ b/ace/Signal.h
@@ -133,6 +133,13 @@ public:
   void handler (ACE_SignalHandler);
   ACE_SignalHandler handler (void);
 
+#if 0
+  // = Set/get current sa_sigaction, which is needed for POSIX
+  // real-time signals.
+  void sigaction (ACE_SignalHandler);
+  ACE_SignalHandler sigaction (void);
+#endif /* 0 */
+
   void dump (void) const;
   // Dump the state of an object.
 
diff --git a/ace/Signal.i b/ace/Signal.i
index 1cb775cce87..9e00f3e8a49 100644
--- a/ace/Signal.i
+++ b/ace/Signal.i
@@ -147,6 +147,22 @@ ACE_Sig_Action::handler (ACE_SignalHandler handler)
 #endif /* !ACE_HAS_TANDEM_SIGNALS */
 }
 
+#if 0
+ACE_INLINE ACE_SignalHandler
+ACE_Sig_Action::sigaction (void)
+{
+  ACE_TRACE ("ACE_Sig_Action::sigaction");
+  return ACE_SignalHandler (this->sa_.sa_sigaction);
+}
+
+ACE_INLINE void
+ACE_Sig_Action::sigaction (ACE_SignalHandler handler)
+{
+  ACE_TRACE ("ACE_Sig_Action::handler");
+  this->sa_.sa_sigaction = (void (*)()) ACE_SignalHandlerV (handler);
+}
+#endif /* 0 */
+
 ACE_INLINE void
 ACE_Sig_Action::set (struct sigaction *sa)
 {
diff --git a/ace/Synch_T.i b/ace/Synch_T.i
index ddf2c8f7514..1c3eef7deff 100644
--- a/ace/Synch_T.i
+++ b/ace/Synch_T.i
@@ -146,7 +146,7 @@ ACE_Condition<MUTEX>::broadcast (void)
 #if !(defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)))
 template <class TYPE> ACE_INLINE
 ACE_TSS<TYPE>::ACE_TSS (TYPE *type)
-  type_ (type)
+  : type_ (type)
 {
 }