diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 3 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 3 | ||||
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | ace/POSIX_Proactor.cpp | 6 |
5 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 79d9044628f..f44123a1d9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,7 +3,8 @@ Thu Aug 16 10:34:20 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> * ace/POSIX_Proactor.cpp (allocate_aio_slot): Added a fix so that the POSIX Proactor compiles with FreeBSD 4.4. Thanks to Yev Omenzel <omenzel@yahoo.com> for reporting this and to Craig - Rodrigues <crodrigu@bbn.com> for fixing it. + Rodrigues <crodrigu@bbn.com> for fixing it and to + John E Hein <jhein@timing.com> for fixing the fix ;-) Thu Aug 16 08:09:53 2001 Chad Elliott <elliott_c@ociweb.com> diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 79d9044628f..f44123a1d9b 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -3,7 +3,8 @@ Thu Aug 16 10:34:20 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> * ace/POSIX_Proactor.cpp (allocate_aio_slot): Added a fix so that the POSIX Proactor compiles with FreeBSD 4.4. Thanks to Yev Omenzel <omenzel@yahoo.com> for reporting this and to Craig - Rodrigues <crodrigu@bbn.com> for fixing it. + Rodrigues <crodrigu@bbn.com> for fixing it and to + John E Hein <jhein@timing.com> for fixing the fix ;-) Thu Aug 16 08:09:53 2001 Chad Elliott <elliott_c@ociweb.com> diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 79d9044628f..f44123a1d9b 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -3,7 +3,8 @@ Thu Aug 16 10:34:20 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> * ace/POSIX_Proactor.cpp (allocate_aio_slot): Added a fix so that the POSIX Proactor compiles with FreeBSD 4.4. Thanks to Yev Omenzel <omenzel@yahoo.com> for reporting this and to Craig - Rodrigues <crodrigu@bbn.com> for fixing it. + Rodrigues <crodrigu@bbn.com> for fixing it and to + John E Hein <jhein@timing.com> for fixing the fix ;-) Thu Aug 16 08:09:53 2001 Chad Elliott <elliott_c@ociweb.com> @@ -1315,6 +1315,7 @@ Gary Duzan <gduzan@bbn.com> Garry Shammis <Garry.Shamis@kbcfp.com> Eamonn Saunders <Esaunders@softricity.com> Yev Omenzel <omenzel@yahoo.com> +John E Hein <jhein@timing.com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/ace/POSIX_Proactor.cpp b/ace/POSIX_Proactor.cpp index aa15025eac2..a3480aa01d7 100644 --- a/ace/POSIX_Proactor.cpp +++ b/ace/POSIX_Proactor.cpp @@ -1699,10 +1699,10 @@ 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 (); -#ifdef (__FreeBSD__) - result->aio_sigevent.sigev_value.sival_int = retval; -#else +#if defined (__FreeBSD__) result->aio_sigevent.sigev_value.sigval_int = retval; +#else + result->aio_sigevent.sigev_value.sival_int = retval; #endif /* __FreeBSD__ */ return retval; |