diff options
author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-03-05 20:22:43 +0000 |
---|---|---|
committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-03-05 20:22:43 +0000 |
commit | 459ebe50bae94f1e4b3fb240ca380309e77e91f9 (patch) | |
tree | 580be94e663dbeee446e5811b4d166a00ec54cbe | |
parent | fa6636d78d4f3c15091bb16ed5bc2595caaa1733 (diff) | |
download | ATCD-459ebe50bae94f1e4b3fb240ca380309e77e91f9.tar.gz |
ChangeLogTag:Tue Mar 5 12:20:26 2002 Ossama Othman <ossama@uci.edu>
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-02a | 8 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-03a | 8 | ||||
-rw-r--r-- | ace/INET_Addr.cpp | 8 |
4 files changed, 28 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index d2b249db628..850018c7027 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Mar 5 12:20:26 2002 Ossama Othman <ossama@uci.edu> + + * ace/INET_Addr.cpp (get_host_name_i, set): + + h_errno -> h_error. h_errno conflicts with a declaration + Microsoft's Winsock headers. Thanks to Nanbor for pointing out + the problem. + Tue Mar 05 09:26:46 2002 Ossama Othman <ossama@uci.edu> * ace/INET_Addr.cpp (get_host_name_i, set): diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index d2b249db628..850018c7027 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Tue Mar 5 12:20:26 2002 Ossama Othman <ossama@uci.edu> + + * ace/INET_Addr.cpp (get_host_name_i, set): + + h_errno -> h_error. h_errno conflicts with a declaration + Microsoft's Winsock headers. Thanks to Nanbor for pointing out + the problem. + Tue Mar 05 09:26:46 2002 Ossama Othman <ossama@uci.edu> * ace/INET_Addr.cpp (get_host_name_i, set): diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index d2b249db628..850018c7027 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,11 @@ +Tue Mar 5 12:20:26 2002 Ossama Othman <ossama@uci.edu> + + * ace/INET_Addr.cpp (get_host_name_i, set): + + h_errno -> h_error. h_errno conflicts with a declaration + Microsoft's Winsock headers. Thanks to Nanbor for pointing out + the problem. + Tue Mar 05 09:26:46 2002 Ossama Othman <ossama@uci.edu> * ace/INET_Addr.cpp (get_host_name_i, set): diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp index f6aac19bc2d..6663408a5d1 100644 --- a/ace/INET_Addr.cpp +++ b/ace/INET_Addr.cpp @@ -279,10 +279,10 @@ ACE_INET_Addr::set (u_short port_number, # else hostent hentry; ACE_HOSTENT_DATA buf; - int h_errno; // Not the same as errno! + int h_error; // Not the same as errno! hostent *hp = ACE_OS::gethostbyname_r (host_name, &hentry, - buf, &h_errno); + buf, &h_error); # endif /* VXWORKS */ if (hp == 0) @@ -704,7 +704,7 @@ ACE_INET_Addr::get_host_name_i (char hostname[], size_t len) const this->ip_addr_size (), this->get_type ()); # else - int h_errno; // Not the same as errno! + int h_error; // Not the same as errno! hostent hentry; ACE_HOSTENT_DATA buf; hostent *hp = @@ -713,7 +713,7 @@ ACE_INET_Addr::get_host_name_i (char hostname[], size_t len) const this->get_type (), &hentry, buf, - &h_errno); + &h_error); # endif /* CHORUS */ if (hp == 0 || hp->h_name == 0) |