summaryrefslogtreecommitdiff
path: root/ace/Signal.i
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-12-31 14:38:49 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-12-31 14:38:49 +0000
commite1ba2201c7e7109130f4ab4e3d7dde59038b7a25 (patch)
tree3770b8cdb436a53c8321c37678b20b50f5415507 /ace/Signal.i
parent688b50d6e8df997a847ed6ce294062d9340e4a6c (diff)
downloadATCD-e1ba2201c7e7109130f4ab4e3d7dde59038b7a25.tar.gz
replaced NSIG with ACE_NSIG
Diffstat (limited to 'ace/Signal.i')
-rw-r--r--ace/Signal.i28
1 files changed, 14 insertions, 14 deletions
diff --git a/ace/Signal.i b/ace/Signal.i
index ed39ddaa810..f8e5edfbc40 100644
--- a/ace/Signal.i
+++ b/ace/Signal.i
@@ -49,7 +49,7 @@ ACE_INLINE int
ACE_Sig_Set::empty_set (void)
{
ACE_TRACE ("ACE_Sig_Set::empty_set");
- return ACE_OS::sigemptyset (&this->sigset_);
+ return ACE_OS::sigemptyset (&this->sigset_);
}
ACE_INLINE int
@@ -141,9 +141,9 @@ ACE_INLINE void
ACE_Sig_Action::handler (ACE_SignalHandler handler)
{
ACE_TRACE ("ACE_Sig_Action::handler");
-#if !defined(ACE_HAS_TANDEM_SIGNALS)
+#if !defined(ACE_HAS_TANDEM_SIGNALS)
this->sa_.sa_handler = ACE_SignalHandlerV (handler);
-#else
+#else
this->sa_.sa_handler = (void (*)()) ACE_SignalHandlerV (handler);
#endif /* !ACE_HAS_TANDEM_SIGNALS */
}
@@ -178,7 +178,7 @@ ACE_Sig_Action::get (void)
return &this->sa_;
}
-ACE_INLINE
+ACE_INLINE
ACE_Sig_Action::operator ACE_SIGACTION * ()
{
ACE_TRACE ("ACE_Sig_Action::operator ACE_SIGACTION *");
@@ -197,7 +197,7 @@ ACE_Sig_Action::register_action (int signum, ACE_Sig_Action *oaction)
{
ACE_TRACE ("ACE_Sig_Action::register_action");
struct sigaction *sa = oaction == 0 ? 0 : oaction->get ();
-
+
return ACE_OS::sigaction (signum, &this->sa_, sa);
}
@@ -216,9 +216,9 @@ ACE_Sig_Action::restore_action (int signum, ACE_Sig_Action &oaction)
return ACE_OS::sigaction (signum, &this->sa_, 0);
}
-// Block out the signal MASK until the destructor is called.
+// Block out the signal MASK until the destructor is called.
-ACE_INLINE
+ACE_INLINE
ACE_Sig_Guard::ACE_Sig_Guard (ACE_Sig_Set *mask)
{
//ACE_TRACE ("ACE_Sig_Guard::ACE_Sig_Guard");
@@ -229,29 +229,29 @@ ACE_Sig_Guard::ACE_Sig_Guard (ACE_Sig_Set *mask)
#if 0
ACE_Sig_Set smask (1);
#endif
-
+
#if defined (ACE_LACKS_PTHREAD_THR_SIGSETMASK)
ACE_OS::sigprocmask (SIG_BLOCK, (sigset_t *) ACE_Object_Manager::default_mask (), (sigset_t *)
- this->omask_);
+ this->omask_);
#else
ACE_OS::thr_sigsetmask (SIG_BLOCK, (sigset_t *) ACE_Object_Manager::default_mask (), (sigset_t *)
- this->omask_);
+ this->omask_);
#endif /* ACE_LACKS_PTHREAD_THR_SIGSETMASK */
}
else
#if defined (ACE_LACKS_PTHREAD_THR_SIGSETMASK)
ACE_OS::sigprocmask (SIG_BLOCK, (sigset_t *) *mask, (sigset_t *)
- this->omask_);
+ this->omask_);
#else
ACE_OS::thr_sigsetmask (SIG_BLOCK, (sigset_t *) *mask, (sigset_t *)
- this->omask_);
+ this->omask_);
#endif /* ACE_LACKS_PTHREAD_THR_SIGSETMASK */
}
// Restore the signal mask.
-ACE_INLINE
+ACE_INLINE
ACE_Sig_Guard::~ACE_Sig_Guard (void)
{
//ACE_TRACE ("ACE_Sig_Guard::~ACE_Sig_Guard");
@@ -266,5 +266,5 @@ ACE_INLINE int
ACE_Sig_Handler::in_range (int signum)
{
ACE_TRACE ("ACE_Sig_Handler::in_range");
- return signum > 0 && signum < NSIG;
+ return signum > 0 && signum < ACE_NSIG;
}