diff options
author | Erik Sohns <esohns@users.noreply.github.com> | 2023-01-22 17:38:34 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-22 17:38:34 +0100 |
commit | 9e18d338ec598e1a8da6d32a0fba5a20c76978f7 (patch) | |
tree | 045f42001bd4e15cf8285686798fe47acd2f2b60 /ACE/ace/Monitor_Control/Packets_Received_Monitor.h | |
parent | 8b6ad82dc91f728cea2c9e86a17e5969a3338fcc (diff) | |
parent | 8ab31e3e5bb8c09a9c326a54545f4cb475345a78 (diff) | |
download | ATCD-9e18d338ec598e1a8da6d32a0fba5a20c76978f7.tar.gz |
Merge branch 'master' into message_queue_ex_get_queue
Diffstat (limited to 'ACE/ace/Monitor_Control/Packets_Received_Monitor.h')
-rw-r--r-- | ACE/ace/Monitor_Control/Packets_Received_Monitor.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/ACE/ace/Monitor_Control/Packets_Received_Monitor.h b/ACE/ace/Monitor_Control/Packets_Received_Monitor.h index d7f80a1491d..d0338dfde6b 100644 --- a/ACE/ace/Monitor_Control/Packets_Received_Monitor.h +++ b/ACE/ace/Monitor_Control/Packets_Received_Monitor.h @@ -23,10 +23,8 @@ #if defined (ACE_HAS_PDH_H) && !defined (ACE_LACKS_PDH_H) #include "ace/Monitor_Control/Windows_Multi_Instance_Monitor.h" -#elif defined (ACE_LINUX) || defined (AIX) +#elif defined (ACE_LINUX) #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 (__Lynx__) #include "ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h" #elif defined (__NetBSD__) || defined (__OpenBSD__) @@ -52,10 +50,8 @@ namespace ACE : public Monitor_Base #if defined (ACE_HAS_WIN32_PDH) , public Windows_Multi_Instance_Monitor -#elif defined (ACE_LINUX) || defined (AIX) +#elif defined (ACE_LINUX) , public Linux_Network_Interface_Monitor -#elif defined (ACE_HAS_KSTAT) - , public Solaris_Network_Interface_Monitor #elif defined (__NetBSD__) || defined (__OpenBSD__) , public BSD_Network_Interface_Monitor #elif defined (__FreeBSD__) || defined (__Lynx__) |