ChangeLogTag: Thu Jul 9 06:44:32 UTC 2009 Olli Savia <ops@iki.fi>

7 files changed, 32 insertions, 10 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 584482b7b59..4879692b8ef 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,7 +1,17 @@
+Thu Jul  9 06:44:32 UTC 2009  Olli Savia  <ops@iki.fi>
+
+        * ace/Monitor_Control/Bytes_Received_Monitor.h:
+        * ace/Monitor_Control/Bytes_Sent_Monitor.h:
+        * ace/Monitor_Control/Bytes_Sent_Monitor.cpp:
+        * ace/Monitor_Control/Packets_Received_Monitor.h:
+        * ace/Monitor_Control/Packets_Received_Monitor.cpp:
+        * ace/Monitor_Control/Packets_Sent_Monitor.h:
+          Fixed compile errors on FreeBSD.
+
 Wed Jul  8 14:22:41 UTC 2009  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * ace/Monitor_Control/Makefile.am:
-        
+
           Added new files FreeBSD_Network_Interface_Monitor.{h,cpp}
           to the makefile.
 
@@ -9,9 +19,9 @@ Tue Jul  7 22:21:03 UTC 2009  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp:
         * ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h:
-        
+
           New files, defining a monitor for FreeBSD.
-        
+
         * ace/Monitor_Control/Bytes_Received_Monitor.cpp:
         * ace/Monitor_Control/BSD_Network_Interface_Monitor.h:
         * ace/Monitor_Control/Monitor_Control.mpc:
@@ -21,7 +31,7 @@ Tue Jul  7 22:21:03 UTC 2009  Jeff Parsons <j.parsons@vanderbilt.edu>
         * ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp:
         * ace/Monitor_Control/Packets_Received_Monitor.h:
         * ace/Monitor_Control/Packets_Sent_Monitor.cpp:
-        
+
           New files added to MPC project and existing monitors
           patched with NetBSD/OpenBSD-related changes. Thanks to
           Boyan Kasarov <bkasarov at gmail dot com> for submitting
diff --git a/ACE/ace/Monitor_Control/Bytes_Received_Monitor.h b/ACE/ace/Monitor_Control/Bytes_Received_Monitor.h
index cbb188b92f7..335800a02eb 100644
--- a/ACE/ace/Monitor_Control/Bytes_Received_Monitor.h
+++ b/ACE/ace/Monitor_Control/Bytes_Received_Monitor.h
@@ -29,7 +29,9 @@
 #include "ace/Monitor_Control/Linux_Network_Interface_Monitor.h"
 #elif defined (ACE_HAS_KSTAT)
 #include "ace/Monitor_Control/Solaris_Network_Interface_Monitor.h"
-#elif defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) 
+#elif defined (__FreeBSD__)
+#include "ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h"
+#elif defined (__NetBSD__) || defined (__OpenBSD__) 
 #include "ace/Monitor_Control/BSD_Network_Interface_Monitor.h"
 #else
 #include "ace/Monitor_Control/Null_Network_Interface_Monitor.h"
diff --git a/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.cpp b/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.cpp
index 14a1e83c240..8611de56eb0 100644
--- a/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.cpp
@@ -24,7 +24,9 @@ namespace ACE
             /// Scan format for /proc/net/dev
 #elif defined (ACE_HAS_KSTAT)
       , Solaris_Network_Interface_Monitor (ACE_TEXT ("obytes"))
-#elif defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) 
+#elif defined (__FreeBSD__)
+      , FreeBSD_Network_Interface_Monitor (ACE_TEXT ("obytes"))
+#elif defined (__NetBSD__) || defined (__OpenBSD__) 
       , BSD_Network_Interface_Monitor (ACE_TEXT ("obytes"))
 #endif
     {}
diff --git a/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.h b/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.h
index d25346a6e14..4a333ccf8ed 100644
--- a/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.h
+++ b/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.h
@@ -29,7 +29,9 @@
 #include "ace/Monitor_Control/Linux_Network_Interface_Monitor.h"
 #elif defined (ACE_HAS_KSTAT)
 #include "ace/Monitor_Control/Solaris_Network_Interface_Monitor.h"
-#elif defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) 
+#elif defined (__FreeBSD__)
+#include "ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h"
+#elif defined (__NetBSD__) || defined (__OpenBSD__) 
 #include "ace/Monitor_Control/BSD_Network_Interface_Monitor.h"
 #else
 #include "ace/Monitor_Control/Null_Network_Interface_Monitor.h"
diff --git a/ACE/ace/Monitor_Control/Packets_Received_Monitor.cpp b/ACE/ace/Monitor_Control/Packets_Received_Monitor.cpp
index 1b7e4eaff36..f57ad79dace 100644
--- a/ACE/ace/Monitor_Control/Packets_Received_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Packets_Received_Monitor.cpp
@@ -24,7 +24,9 @@ namespace ACE
             /// Scan format for /proc/net/dev
 #elif defined (ACE_HAS_KSTAT)
       , Solaris_Network_Interface_Monitor (ACE_TEXT ("ipackets"))
-#elif defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) 
+#elif defined (__FreeBSD__)
+      , FreeBSD_Network_Interface_Monitor (ACE_TEXT ("ipackets"))
+#elif defined (__NetBSD__) || defined (__OpenBSD__) 
       , BSD_Network_Interface_Monitor (ACE_TEXT ("ipackets"))
 #endif
     {}
diff --git a/ACE/ace/Monitor_Control/Packets_Received_Monitor.h b/ACE/ace/Monitor_Control/Packets_Received_Monitor.h
index 7edbff58439..031bacd7e19 100644
--- a/ACE/ace/Monitor_Control/Packets_Received_Monitor.h
+++ b/ACE/ace/Monitor_Control/Packets_Received_Monitor.h
@@ -29,7 +29,9 @@
 #include "ace/Monitor_Control/Linux_Network_Interface_Monitor.h"
 #elif defined (ACE_HAS_KSTAT)
 #include "ace/Monitor_Control/Solaris_Network_Interface_Monitor.h"
-#elif defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) 
+#elif defined (__FreeBSD__)
+#include "ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h"
+#elif defined (__NetBSD__) || defined (__OpenBSD__) 
 #include "ace/Monitor_Control/BSD_Network_Interface_Monitor.h"
 #else
 #include "ace/Monitor_Control/Null_Network_Interface_Monitor.h"
diff --git a/ACE/ace/Monitor_Control/Packets_Sent_Monitor.h b/ACE/ace/Monitor_Control/Packets_Sent_Monitor.h
index b8494a6b166..b56683550c7 100644
--- a/ACE/ace/Monitor_Control/Packets_Sent_Monitor.h
+++ b/ACE/ace/Monitor_Control/Packets_Sent_Monitor.h
@@ -29,7 +29,9 @@
 #include "ace/Monitor_Control/Linux_Network_Interface_Monitor.h"
 #elif defined (ACE_HAS_KSTAT)
 #include "ace/Monitor_Control/Solaris_Network_Interface_Monitor.h"
-#elif defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) 
+#elif defined (__FreeBSD__)
+#include "ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h"
+#elif defined (__NetBSD__) || defined (__OpenBSD__) 
 #include "ace/Monitor_Control/BSD_Network_Interface_Monitor.h"
 #else
 #include "ace/Monitor_Control/Null_Network_Interface_Monitor.h"