diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2006-11-05 14:16:36 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2006-11-05 14:16:36 +0000 |
| commit | eb14cc3351a926f1f86d9e553cf3eee8ec74dac4 (patch) | |
| tree | 3251d72df9bb9a3cc4346b42363d60b08748c6da | |
| parent | 374cb78541fbb9474be4c8e8af0dd7d5ccbc241f (diff) | |
| download | ATCD-eb14cc3351a926f1f86d9e553cf3eee8ec74dac4.tar.gz | |
Sun Nov 5 14:14:51 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com>
| -rw-r--r-- | ACE/ChangeLog | 9 | ||||
| -rw-r--r-- | ACE/ace/Sock_Connect.cpp | 7 |
2 files changed, 9 insertions, 7 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 258b25fd12e..72584feddb4 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,7 +1,12 @@ +Sun Nov 5 14:14:51 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * ace/Sock_Connect.cpp: + Fix for Solaris x86. + Sat Nov 4 12:46:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * ace/config-sunos4*.h: - Removed these files, these are ancient and not supported anymore + * ace/config-sunos4*.h: + Removed these files, these are ancient and not supported anymore Fri Nov 3 18:12:36 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp index 920a4dcc64e..92e18ac1389 100644 --- a/ACE/ace/Sock_Connect.cpp +++ b/ACE/ace/Sock_Connect.cpp @@ -1804,13 +1804,10 @@ ACE::count_interfaces (ACE_HANDLE handle, #if defined (SIOCGIFNUM) # if defined (SIOCGLIFNUM) int cmd = SIOCGLIFNUM; -# if defined (sparc) // what is a better way of limiting this to solaris? what about x86 solaris? struct lifnum if_num = {AF_UNSPEC,0,0}; -# else - int if_num; -# endif /* sparc */ # else int cmd = SIOCGIFNUM; + int if_num = 0; # endif /* SIOCGLIFNUM */ if (ACE_OS::ioctl (handle, cmd, (caddr_t)&if_num) == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -1818,7 +1815,7 @@ ACE::count_interfaces (ACE_HANDLE handle, ACE_LIB_TEXT ("ACE::count_interfaces:") ACE_LIB_TEXT ("ioctl - SIOCGLIFNUM failed")), -1); -# if defined (SIOCGLIFNUM) && defined (sparc) // see previous comment +# if defined (SIOCGLIFNUM) how_many = if_num.lifn_count; # else how_many = if_num; |