summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>2003-05-20 16:09:49 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>2003-05-20 16:09:49 +0000
commite402cc20aa38b5d1779c7897f743c39db61eec24 (patch)
tree9b3ec758f139b6faa1884733ed81938aff2c5299
parent25fa70d4f18580fb73b689de27698b8b6f322672 (diff)
downloadATCD-e402cc20aa38b5d1779c7897f743c39db61eec24.tar.gz
ChangeLogTag:Tue May 20 10:54:10 2003 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
-rw-r--r--ChangeLog6
-rw-r--r--THANKS1
-rw-r--r--tests/Proactor_Test.cpp4
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 66b9e56919f..d17c25b2588 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue May 20 10:54:10 2003 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
+
+ * tests/Proactor_Test.cpp (open): Changed IPPROTO_TCP to
+ ACE_IPPROTO_TCP. Thanks to David Ohlemacher
+ <ohlemacher@bbn.com> for motivating this.
+
Tue May 20 01:50:35 UTC 2003 Don Hinton <dhinton@dresystems.com>
* tests/Test_Output.dsp:
diff --git a/THANKS b/THANKS
index cd207e4dc06..306e2f3caf1 100644
--- a/THANKS
+++ b/THANKS
@@ -1702,6 +1702,7 @@ Craig Watcham <craigw@ananzi.co.za>
Roland Meub <Roland.Meub@tenovis.com>
Pit Linnartz <Pit.Linnartz@t-mobile.de>
Peder Norgaard <pcn@pogt.dk>
+David Ohlemacher <ohlemacher@bbn.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/tests/Proactor_Test.cpp b/tests/Proactor_Test.cpp
index 2098ca2562b..df2b9b3005a 100644
--- a/tests/Proactor_Test.cpp
+++ b/tests/Proactor_Test.cpp
@@ -644,7 +644,7 @@ Receiver::open (ACE_HANDLE handle, ACE_Message_Block &)
this->handle_ = handle;
int nodelay = 1;
ACE_SOCK_Stream option_setter (handle);
- if (-1 == option_setter.set_option (IPPROTO_TCP,
+ if (-1 == option_setter.set_option (ACE_IPPROTO_TCP,
TCP_NODELAY,
&nodelay,
sizeof (nodelay)))
@@ -1293,7 +1293,7 @@ Sender::open (ACE_HANDLE handle, ACE_Message_Block &)
this->handle_ = handle;
int nodelay = 1;
ACE_SOCK_Stream option_setter (handle);
- if (option_setter.set_option (IPPROTO_TCP,
+ if (option_setter.set_option (ACE_IPPROTO_TCP,
TCP_NODELAY,
&nodelay,
sizeof (nodelay)))