summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2009-04-20 07:45:46 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2009-04-20 07:45:46 +0000
commit34b548027639c242e69cb075393094c69f4305ec (patch)
tree49b152a56f2ba4642f0a50586f8428a62ed272e7
parent1a08386b0dcf8312396f9438e45c190f0d52178e (diff)
downloadATCD-34b548027639c242e69cb075393094c69f4305ec.tar.gz
Mon Apr 20 08:45:32 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Sock_Connect.cpp: Another fix for HPUX
-rw-r--r--ACE/ChangeLog5
-rw-r--r--ACE/ace/Sock_Connect.cpp2
2 files changed, 6 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 8606b803c71..af3e0686783 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Mon Apr 20 08:45:32 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ace/Sock_Connect.cpp:
+ Another fix for HPUX
+
Sun Apr 19 19:10:32 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/config-hpux-11.00.h
diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp
index 14fe74ec12c..2c8af7deaef 100644
--- a/ACE/ace/Sock_Connect.cpp
+++ b/ACE/ace/Sock_Connect.cpp
@@ -1419,7 +1419,7 @@ ACE::count_interfaces (ACE_HANDLE handle, size_t &how_many)
ACE_TEXT ("ACE::count_interfaces:")
ACE_TEXT ("ioctl - SIOCGLIFNUM failed")),
-1);
-# if defined (SIOCGLIFNUM)
+# if defined (SIOCGLIFNUM) && !defined (ACE_LACKS_STRUCT_LIFNUM)
how_many = if_num.lifn_count;
# else
how_many = if_num;