diff options
| author | jwh1 <jwh1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-07-15 00:05:36 +0000 |
|---|---|---|
| committer | jwh1 <jwh1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-07-15 00:05:36 +0000 |
| commit | d333c0a23462439f0499041ecdab65a8e7691765 (patch) | |
| tree | 2f7a1e603493e8c2ba8a18a9617b84e23dac7573 | |
| parent | 51d6ded357d73a2912350612f772c1afd7cb806d (diff) | |
| download | ATCD-d333c0a23462439f0499041ecdab65a8e7691765.tar.gz | |
Fri Jul 14 19:03:49 2000 John Heitmann <jwh1@cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 7 | ||||
| -rw-r--r-- | ace/OS.h | 12 |
4 files changed, 31 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 8f5bcae0586..02663a81ea1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Jul 14 19:03:49 2000 John Heitmann <jwh1@cs.wustl.edu> + + * ace/OS.h: + Changed typedef of ACE_SignalHandler on LynxOS to + use pace_sig_pf when pace is enabled. Also changed + SIG_IGN accordingly. + Fri Jul 14 17:25:29 2000 Steve Huston <shuston@riverace.com> * tests/UNIXserver.conf: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 8f5bcae0586..02663a81ea1 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Fri Jul 14 19:03:49 2000 John Heitmann <jwh1@cs.wustl.edu> + + * ace/OS.h: + Changed typedef of ACE_SignalHandler on LynxOS to + use pace_sig_pf when pace is enabled. Also changed + SIG_IGN accordingly. + Fri Jul 14 17:25:29 2000 Steve Huston <shuston@riverace.com> * tests/UNIXserver.conf: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 8f5bcae0586..02663a81ea1 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,10 @@ +Fri Jul 14 19:03:49 2000 John Heitmann <jwh1@cs.wustl.edu> + + * ace/OS.h: + Changed typedef of ACE_SignalHandler on LynxOS to + use pace_sig_pf when pace is enabled. Also changed + SIG_IGN accordingly. + Fri Jul 14 17:25:29 2000 Steve Huston <shuston@riverace.com> * tests/UNIXserver.conf: @@ -2956,7 +2956,10 @@ typedef int sig_atomic_t; typedef int ssize_t; # endif /* ACE_HAS_SSIZE_T */ -# if defined (ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES) +# if defined (ACE_HAS_PACE) +typedef pace_sig_pf ACE_SignalHandler; +typedef pace_sig_pf ACE_SignalHandlerV; +# elif defined (ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES) // Prototypes for both signal() and struct sigaction are consistent.. # if defined (ACE_HAS_SIG_C_FUNC) extern "C" { @@ -3004,7 +3007,7 @@ typedef void (*ACE_SignalHandlerV)(...); typedef void (*ACE_SignalHandler)(int); # endif /* SIG_PF */ typedef void (*ACE_SignalHandlerV)(...); -# endif /* ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES */ +# endif /* ACE_HAS_PACE */ # if defined (BUFSIZ) # define ACE_STREAMBUF_SIZE BUFSIZ @@ -3999,6 +4002,11 @@ struct sigaction # endif # endif /* SIG_DFL */ +# if defined (ACE_HAS_PACE) && PACE_LYNXOS +# undef SIG_IGN +# define SIG_IGN ((pace_sig_pf) 1) +# endif /* (ACE_HAS_PACE) && PACE_LYNXOS */ + # if !defined (SIG_IGN) # if defined (ACE_PSOS_DIAB_MIPS) || defined (ACE_PSOS_DIAB_PPC) # define SIG_IGN ((void *) 1) /* ignore signal */ |