diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-04-19 18:10:41 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-04-19 18:10:41 +0000 |
| commit | 1a08386b0dcf8312396f9438e45c190f0d52178e (patch) | |
| tree | 13dd9266ff37be750b08f90c0535e4f2256c6646 | |
| parent | 2ae8a1846ea167c796d84d3feb20f9c78096a2f9 (diff) | |
| download | ATCD-1a08386b0dcf8312396f9438e45c190f0d52178e.tar.gz | |
Sun Apr 19 19:10:32 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/config-hpux-11.00.h
* ace/Sock_Connect.cpp:
Added ACE_HAS_STRUCT_LIFNUM, hpux doesn't have this
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/ace/Sock_Connect.cpp | 4 | ||||
| -rw-r--r-- | ACE/ace/config-hpux-11.00.h | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 6b37318bc70..8606b803c71 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Sun Apr 19 19:10:32 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-hpux-11.00.h + * ace/Sock_Connect.cpp: + Added ACE_HAS_STRUCT_LIFNUM, hpux doesn't have this + Sun Apr 19 06:57:04 UTC 2009 James H. Hill <hillj@isis.vanderbilt.edu> * ace/UUID.h: diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp index 215324cfbea..14fe74ec12c 100644 --- a/ACE/ace/Sock_Connect.cpp +++ b/ACE/ace/Sock_Connect.cpp @@ -1346,7 +1346,7 @@ ACE::get_ip_interfaces (size_t &count, ACE_INET_Addr *&addrs) // Retrieve IPv6 local interfaces by scanning /proc/net/if_inet6 if // it exists. If we cannot open it then ignore possible IPv6 // interfaces, we did our best;-) - FILE* fp; + FILE* fp = 0; char addr_p[8][5]; char s_ipaddr[64]; int scopeid; @@ -1406,7 +1406,7 @@ int ACE::count_interfaces (ACE_HANDLE handle, size_t &how_many) { #if defined (SIOCGIFNUM) -# if defined (SIOCGLIFNUM) +# if defined (SIOCGLIFNUM) && !defined (ACE_LACKS_STRUCT_LIFNUM) int cmd = SIOCGLIFNUM; struct lifnum if_num = {AF_UNSPEC,0,0}; # else diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h index 6a3441d6cca..54db1735b53 100644 --- a/ACE/ace/config-hpux-11.00.h +++ b/ACE/ace/config-hpux-11.00.h @@ -367,6 +367,7 @@ #define ACE_HAS_3_PARAM_READDIR_R +#define ACE_LACKS_STRUCT_LIFNUM ////////////////////////////////////////////////////////////////////////// // |