summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--THANKS1
-rw-r--r--apps/drwho/CM_Server.cpp2
-rw-r--r--apps/drwho/ChangeLog6
3 files changed, 8 insertions, 1 deletions
diff --git a/THANKS b/THANKS
index 1d9c2726ee9..1ac985de00e 100644
--- a/THANKS
+++ b/THANKS
@@ -1022,6 +1022,7 @@ Kim Lester <Kim_R_Lester@rta.nsw.gov.au>
Wilson Chan <wilson@i-finance.com.hk>
Victor Krebss <lopik@delfi.lv>
Chander P. Thareja <cthareja@ssind.stpn.soft.net>
+John Mills <jmills@tga.com>
I would particularly like to thank Paul Stephenson, who worked with me
at Ericsson. Paul devised the recursive Makefile scheme that
diff --git a/apps/drwho/CM_Server.cpp b/apps/drwho/CM_Server.cpp
index d53d91949f2..647e74fede8 100644
--- a/apps/drwho/CM_Server.cpp
+++ b/apps/drwho/CM_Server.cpp
@@ -52,7 +52,7 @@ CM_Server::receive (int)
UDP_PACKET_SIZE,
0,
(sockaddr *) &this->sin_,
- &sin_len);
+ (int *) &sin_len);
if (n == -1)
return -1;
diff --git a/apps/drwho/ChangeLog b/apps/drwho/ChangeLog
index eca92bc2898..01a5911cb70 100644
--- a/apps/drwho/ChangeLog
+++ b/apps/drwho/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jul 14 14:44:43 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
+
+ * CM_Server.cpp (receive): Added a cast to (int *) so that
+ certain C++ compilers are happy. Thanks to John Mills
+ <jmills@tga.com> for reporting this.
+
Tue May 23 20:52:29 2000 David L. Levine <levine@cs.wustl.edu>
* CM_Server.cpp (receive): one last time. Use