diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:21:01 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:21:01 +0100 |
| commit | 2e21fa6b925c4572d620248f1b149a5d652836b2 (patch) | |
| tree | d0ff026bc848d7ee466c9b793f42fb9ec4f07f62 /dep/acelite/ace/Process_Manager.cpp | |
| parent | 6ebc6b9a76d0a4576306d777b35ec1a37d3ec5da (diff) | |
Core/Dependencies: Update ACE to v6.1.4 (Windows only)
Tested in multiple configurations
.diff with TC changes added
Diffstat (limited to 'dep/acelite/ace/Process_Manager.cpp')
| -rw-r--r-- | dep/acelite/ace/Process_Manager.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/dep/acelite/ace/Process_Manager.cpp b/dep/acelite/ace/Process_Manager.cpp index e9be7773a8b..7687e1ed839 100644 --- a/dep/acelite/ace/Process_Manager.cpp +++ b/dep/acelite/ace/Process_Manager.cpp @@ -1,4 +1,4 @@ -// $Id: Process_Manager.cpp 91688 2010-09-09 11:21:50Z johnnyw $ +// $Id: Process_Manager.cpp 94454 2011-09-08 17:36:56Z johnnyw $ // Process_Manager.cpp #include "ace/Process_Manager.h" @@ -347,8 +347,7 @@ ACE_Process_Manager::handle_signal (int, #if defined (ACE_WIN32) ACE_HANDLE proc = si->si_handle_; ACE_exitcode status = 0; - BOOL result = ::GetExitCodeProcess (proc, - &status); + BOOL result = ::GetExitCodeProcess (proc, &status); if (result) { if (status != STILL_ACTIVE) @@ -843,7 +842,7 @@ ACE_Process_Manager::wait (pid_t pid, // WAIT_OBJECT_0 is a pointless comparison because // WAIT_OBJECT_0 is zero and DWORD is unsigned long, so this // test is skipped for Green Hills. Same for mingw. -# if defined (ghs) || defined (__MINGW32__) || defined (_MSC_VER) +# if defined (__MINGW32__) || defined (_MSC_VER) ACE_ASSERT (result < WAIT_OBJECT_0 + this->current_count_); # else ACE_ASSERT (result >= WAIT_OBJECT_0 @@ -917,7 +916,7 @@ ACE_Process_Manager::wait (pid_t pid, for (ACE_Countdown_Time time_left (&tmo); ; time_left.update ()) { pid = ACE_OS::waitpid (-1, status, WNOHANG); -# if defined (ACE_VXWORKS) && (ACE_VXWORKS >= 0x600) +# if defined (ACE_VXWORKS) if (pid > 0 || (pid == ACE_INVALID_PID && errno != EINTR)) # else if (pid > 0 || pid == ACE_INVALID_PID) |