summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--ChangeLogs/ChangeLog-02a10
-rw-r--r--ChangeLogs/ChangeLog-03a10
-rw-r--r--THANKS1
-rw-r--r--ace/POSIX_Proactor.cpp6
5 files changed, 33 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index a3ed4c36e17..79d9044628f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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.
+
Thu Aug 16 08:09:53 2001 Chad Elliott <elliott_c@ociweb.com>
* tests/run_test.lst:
@@ -6,6 +13,7 @@ Thu Aug 16 08:09:53 2001 Chad Elliott <elliott_c@ociweb.com>
the Thread_Pool_Reactor_Resume_Test. These are only built if
OTHER is part of the ACE components list.
+
Wed Aug 15 15:50:38 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
* ace/WFMO_Reactor.cpp: Don't try to purge the notifications if
@@ -1061,7 +1069,7 @@ Wed Jul 25 23:49:43 2001 Krishnakumar B <kitty@cs.wustl.edu>
Thanks to Martin Krumpolec <krumpo@pobox.sk> for reporting this.
-Wed Jul 25 23:49:00 2001 Craig Rodrigues <crodrigu@bbn.com>
+Wed Jul 25 23:49:00 2001 Craig Rodrigues <crodrigu@bbn.com>
* include/makeinclude/wrapper_macros.GNU:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index a3ed4c36e17..79d9044628f 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+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.
+
Thu Aug 16 08:09:53 2001 Chad Elliott <elliott_c@ociweb.com>
* tests/run_test.lst:
@@ -6,6 +13,7 @@ Thu Aug 16 08:09:53 2001 Chad Elliott <elliott_c@ociweb.com>
the Thread_Pool_Reactor_Resume_Test. These are only built if
OTHER is part of the ACE components list.
+
Wed Aug 15 15:50:38 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
* ace/WFMO_Reactor.cpp: Don't try to purge the notifications if
@@ -1061,7 +1069,7 @@ Wed Jul 25 23:49:43 2001 Krishnakumar B <kitty@cs.wustl.edu>
Thanks to Martin Krumpolec <krumpo@pobox.sk> for reporting this.
-Wed Jul 25 23:49:00 2001 Craig Rodrigues <crodrigu@bbn.com>
+Wed Jul 25 23:49:00 2001 Craig Rodrigues <crodrigu@bbn.com>
* include/makeinclude/wrapper_macros.GNU:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index a3ed4c36e17..79d9044628f 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,10 @@
+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.
+
Thu Aug 16 08:09:53 2001 Chad Elliott <elliott_c@ociweb.com>
* tests/run_test.lst:
@@ -6,6 +13,7 @@ Thu Aug 16 08:09:53 2001 Chad Elliott <elliott_c@ociweb.com>
the Thread_Pool_Reactor_Resume_Test. These are only built if
OTHER is part of the ACE components list.
+
Wed Aug 15 15:50:38 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
* ace/WFMO_Reactor.cpp: Don't try to purge the notifications if
@@ -1061,7 +1069,7 @@ Wed Jul 25 23:49:43 2001 Krishnakumar B <kitty@cs.wustl.edu>
Thanks to Martin Krumpolec <krumpo@pobox.sk> for reporting this.
-Wed Jul 25 23:49:00 2001 Craig Rodrigues <crodrigu@bbn.com>
+Wed Jul 25 23:49:00 2001 Craig Rodrigues <crodrigu@bbn.com>
* include/makeinclude/wrapper_macros.GNU:
diff --git a/THANKS b/THANKS
index ce96f526a51..55837a2b69d 100644
--- a/THANKS
+++ b/THANKS
@@ -1314,6 +1314,7 @@ Blair Zajac <blair@gps.caltech.edu>
Gary Duzan <gduzan@bbn.com>
Garry Shammis <Garry.Shamis@kbcfp.com>
Eamonn Saunders <Esaunders@softricity.com>
+Yev Omenzel <omenzel@yahoo.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 7fe02c98da6..aa15025eac2 100644
--- a/ace/POSIX_Proactor.cpp
+++ b/ace/POSIX_Proactor.cpp
@@ -1699,7 +1699,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 ();
- result->aio_sigevent.sigev_value.sival_int = retval;
+#ifdef (__FreeBSD__)
+ result->aio_sigevent.sigev_value.sival_int = retval;
+#else
+ result->aio_sigevent.sigev_value.sigval_int = retval;
+#endif /* __FreeBSD__ */
return retval;
}