summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-06-17 12:43:24 +0000
committerjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-06-17 12:43:24 +0000
commit36a905b92bbe2ac7427b98c1042347987c78cdc3 (patch)
tree5873eb37bd25d6b116ba5b0faddb5765b48a426a
parent4ee51486c14b1189b7bc86af2d5b3fd345f19cd3 (diff)
downloadATCD-36a905b92bbe2ac7427b98c1042347987c78cdc3.tar.gz
ChangeLogTag: Tue Jun 17 12:40:03 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com>
-rw-r--r--ACE/ChangeLog10
-rw-r--r--ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp1
2 files changed, 9 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 1d71c453d6e..c3146cee768 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jun 17 12:40:03 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com>
+
+ * ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp:
+
+ Explicitly #include <sys/sockio.h> for non-inline builds.
+
Tue Jun 17 09:30:00 UTC 2008 Simon Massey <sma at prismtech dot com>
* apps/JAWS/clients/WebSTONE/src/bench.c:
@@ -19,9 +25,9 @@ Tue Jun 17 06:42:51 UTC 2008 Yan Dai <dai_y@ociweb.com>
* ace/Stack_Trace.cpp:
- Fixed declared method (determine_starting_frame) never referenced
+ Fixed declared method (determine_starting_frame) never referenced
warning on HP aCC build.
-
+
Mon Jun 16 21:26:05 UTC 2008 Abdullah Sowayan <abdullah.sowayan@lmco.com>
* bin/fuzz.pl:
diff --git a/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp
index ffb2f3f9cd7..e8a7a3acc06 100644
--- a/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp
@@ -8,6 +8,7 @@
#include "ace/OS_NS_stdio.h"
#include <sys/types.h>
#include <sys/socket.h>
+#include <sys/sockio.h>
#include <ifaddrs.h>
ACE_BEGIN_VERSIONED_NAMESPACE_DECL