diff options
Diffstat (limited to 'ACE/ace/POSIX_Proactor.cpp')
| -rw-r--r-- | ACE/ace/POSIX_Proactor.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ACE/ace/POSIX_Proactor.cpp b/ACE/ace/POSIX_Proactor.cpp index 395f5a08a32..1664200ecf6 100644 --- a/ACE/ace/POSIX_Proactor.cpp +++ b/ACE/ace/POSIX_Proactor.cpp @@ -1720,7 +1720,7 @@ int ACE_POSIX_SIG_Proactor::notify_completion (int sig_num) { // Get this process id. - pid_t const pid = ACE_OS::getpid (); + pid_t pid = ACE_OS::getpid (); if (pid == (pid_t) -1) ACE_ERROR_RETURN ((LM_ERROR, "Error:%N:%l(%P | %t):%p", @@ -1729,11 +1729,11 @@ ACE_POSIX_SIG_Proactor::notify_completion (int sig_num) // Set the signal information. sigval value; -#if defined (ACE_HAS_SIGVAL_SIGVAL_INT) +#if defined (__FreeBSD__) value.sigval_int = -1; #else value.sival_int = -1; -#endif /* ACE_HAS_SIGVAL_SIGVAL_INT */ +#endif /* __FreeBSD__ */ // Queue the signal. if (sigqueue (pid, sig_num, value) == 0) @@ -1870,11 +1870,11 @@ ACE_POSIX_SIG_Proactor::allocate_aio_slot (ACE_POSIX_Asynch_Result *result) // store index!!, not pointer in signal info result->aio_sigevent.sigev_notify = SIGEV_SIGNAL; result->aio_sigevent.sigev_signo = result->signal_number (); -#if defined (ACE_HAS_SIGVAL_SIGVAL_INT) +#if defined (__FreeBSD__) result->aio_sigevent.sigev_value.sigval_int = static_cast<int> (i); #else result->aio_sigevent.sigev_value.sival_int = static_cast<int> (i); -#endif /* ACE_HAS_SIGVAL_SIGVAL_INT */ +#endif /* __FreeBSD__ */ return static_cast<ssize_t> (i); } @@ -1922,11 +1922,11 @@ ACE_POSIX_SIG_Proactor::handle_events_i (const ACE_Time_Value *timeout) flg_aio = 1; // AIO signal received // define index to start // nothing will happen if it contains garbage -#if defined (ACE_HAS_SIGVAL_SIGVAL_INT) +#if defined (__FreeBSD__) index = static_cast<size_t> (sig_info.si_value.sigval_int); #else index = static_cast<size_t> (sig_info.si_value.sival_int); -#endif /* ACE_HAS_SIGVAL_SIGVAL_INT */ +#endif // Assume we have a correctly-functioning implementation, and that // there is one I/O to process, and it's correctly specified in the // siginfo received. There are, however, some special situations |