diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2002-07-20 13:55:13 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2002-07-20 13:55:13 +0000 |
| commit | bd3f53c299fbbf08bfdff14fab048fb2c89bf28f (patch) | |
| tree | 0b05b44a367acff731cd7f889f8ccd302ce3bb78 | |
| parent | 736940caff46bdd7a04a8a25f785071e122667a6 (diff) | |
| download | ATCD-bd3f53c299fbbf08bfdff14fab048fb2c89bf28f.tar.gz | |
ChangeLogTag:Sat Jul 20 08:53:05 2002 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 6 | ||||
| -rw-r--r-- | THANKS | 2 | ||||
| -rw-r--r-- | ace/SOCK_Dgram.cpp | 3 |
4 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index de95a880bb0..1222f664016 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Jul 20 08:53:05 2002 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/SOCK_Dgram.cpp (set_nic): Moved the #endif for + ACE_WIN32 *ahead* of the set_options() call. Thanks to Joe + Hayes <Joe.Hayes@lmco.com> for reporting this. + Fri Jul 19 14:42:37 2002 Steve Huston <shuston@riverace.com> * ace/WFMO_Reactor.cpp (make_changes_in_suspension_infos, diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index de95a880bb0..1222f664016 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Sat Jul 20 08:53:05 2002 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/SOCK_Dgram.cpp (set_nic): Moved the #endif for + ACE_WIN32 *ahead* of the set_options() call. Thanks to Joe + Hayes <Joe.Hayes@lmco.com> for reporting this. + Fri Jul 19 14:42:37 2002 Steve Huston <shuston@riverace.com> * ace/WFMO_Reactor.cpp (make_changes_in_suspension_infos, @@ -1004,7 +1004,7 @@ Dorr H. Clark <dhclark@Lynx.COM> Dave McNeely <Dave_McNeely@md.northgrum.com> Eric Malenfant <EMalenfant@interstarinc.com> Roland Fischer <roli@gugus.com> -Alexander Libman <alibman@ihug.com.au> +Alexander Libman <alexl@aurema.com> Roger Larsson <larssoro@hotmail.com> Martin Stack <mstack@cambertx.com> Michael Ravits <miquel@bitsmart.com> diff --git a/ace/SOCK_Dgram.cpp b/ace/SOCK_Dgram.cpp index 661e546df96..5b7ab885f94 100644 --- a/ace/SOCK_Dgram.cpp +++ b/ace/SOCK_Dgram.cpp @@ -528,6 +528,7 @@ ACE_SOCK_Dgram::set_nic (const char *option_value) socket_address = ACE_reinterpret_cast(sockaddr_in *, &if_address.ifr_addr); multicast_address.imr_interface.s_addr = socket_address->sin_addr.s_addr; +#endif /* ACE_WIN32 */ /* * Now. I got the interface address for the 'nic' specified. @@ -538,6 +539,4 @@ ACE_SOCK_Dgram::set_nic (const char *option_value) IP_MULTICAST_IF, &multicast_address.imr_interface.s_addr, sizeof (struct in_addr)); -#endif /* ACE_WIN32 */ - } |