summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ace/OS.cpp2
-rw-r--r--ace/OS.i8
2 files changed, 5 insertions, 5 deletions
diff --git a/ace/OS.cpp b/ace/OS.cpp
index 2a8b83b75cd..8765dde0f39 100644
--- a/ace/OS.cpp
+++ b/ace/OS.cpp
@@ -649,7 +649,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
#if defined (ACE_HAS_DCETHREADS) && !defined (ACE_HAS_SETKIND_NP)
sparam.sched_priority = priority > PRIORITY_MAX ? PRIORITY_MAX : priority;
-#elif defined(ACE_HAS_IRIX62_THREADS)
+#elif defined(ACE_HAS_IRIX62_THREADS) || defined (ACE_HAS_PTHREADS_XAVIER)
sparam.sched_priority = priority > PTHREAD_MAX_PRIORITY ? PTHREAD_MAX_PRIORITY : priority;
#elif defined (PTHREAD_MAX_PRIORITY) /* For MIT pthreads... */
sparam.prio = priority > PTHREAD_MAX_PRIORITY ? PTHREAD_MAX_PRIORITY : priority;
diff --git a/ace/OS.i b/ace/OS.i
index 6dd0503996a..18bd98bb976 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -1257,7 +1257,7 @@ ACE_OS::cond_wait (ACE_cond_t *cv,
cv->waiters_--;
// Release the signaler/broadcaster if we're the last waiter.
if (cv->waiters_ == 0)
- ::SetEvent (cv->waiters_done_);
+ ACE_OS::event_signal (cv->waiters_done_);
ACE_OS::mutex_unlock (cv->internal_mutex_);
}
}
@@ -1342,7 +1342,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv,
cv->waiters_--;
// Release the signaler/broadcaster if we're the last waiter.
if (cv->waiters_ == 0)
- ::SetEvent (cv->waiters_done_);
+ ACE_OS::event_signal (cv->waiters_done_);
ACE_OS::mutex_unlock (cv->internal_mutex_);
}
}
@@ -1453,7 +1453,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv,
cv->waiters_--;
// Release the signaler/broadcaster if we're the last waiter.
if (cv->waiters_ == 0)
- ::SetEvent (cv->waiters_done_);
+ ACE_OS::event_signal (cv->waiters_done_);
ACE_OS::thread_mutex_unlock (cv->internal_mutex_);
}
}
@@ -1516,7 +1516,7 @@ ACE_OS::cond_wait (ACE_cond_t *cv,
cv->waiters_--;
// Release the signaler/broadcaster if we're the last waiter.
if (cv->waiters_ == 0)
- ::SetEvent (cv->waiters_done_);
+ ACE_OS::event_signal (cv->waiters_done_);
ACE_OS::thread_mutex_unlock (cv->internal_mutex_);
}
}