diff options
| author | oci <oci@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-01-19 18:23:54 +0000 |
|---|---|---|
| committer | oci <oci@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-01-19 18:23:54 +0000 |
| commit | bf866ff95b78c58e6e05a86b97d89f646c6b6900 (patch) | |
| tree | 8400f44ec23f635fd4b358fe3e2eba22df0a6b1e /ace/WFMO_Reactor.cpp | |
| parent | e41ccabd4ed1e1fbfe4a0f65b44372a3344c36a4 (diff) | |
| download | ATCD-bf866ff95b78c58e6e05a86b97d89f646c6b6900.tar.gz | |
Changes to support Green Hills Native x86 compiler.
Diffstat (limited to 'ace/WFMO_Reactor.cpp')
| -rw-r--r-- | ace/WFMO_Reactor.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ace/WFMO_Reactor.cpp b/ace/WFMO_Reactor.cpp index dfe492f9dc6..49dfe218241 100644 --- a/ace/WFMO_Reactor.cpp +++ b/ace/WFMO_Reactor.cpp @@ -1612,7 +1612,7 @@ ACE_WFMO_Reactor::ok_to_wait (ACE_Time_Value *max_wait_time, int timeout = max_wait_time == 0 ? INFINITE : max_wait_time->msec (); // Atomically wait for both the <lock_> and <ok_to_wait_> event - int result = 0; + DWORD result = 0; while (1) { #if defined (ACE_HAS_PHARLAP) @@ -1721,7 +1721,7 @@ ACE_WFMO_Reactor::dispatch (int wait_status) // Expire timers handlers_dispatched += this->expire_timers (); - switch (wait_status) + switch ((DWORD)wait_status) { case WAIT_FAILED: // Failure. ACE_OS::set_errno_to_last_error (); @@ -1763,8 +1763,8 @@ ACE_WFMO_Reactor::dispatch_handles (size_t wait_status) number_of_handlers_dispatched++) { bool ok = ( -#if ! (defined(__BORLANDC__) && (__BORLANDC__ >= 0x0530)) - // wait_status is unsigned in Borland; +#if ! (defined(__BORLANDC__) && (__BORLANDC__ >= 0x0530)) && !defined (ghs) + // wait_status is unsigned in Borland and Green Hills; // This >= is always true, with a warning. wait_status >= WAIT_OBJECT_0 && #endif |