Moved snmp-related variable_list from typedefs.h to snmp_core.h

diff --git a/src/snmp_agent.h b/src/snmp_agent.h
index d60c68f2642ee2c873ca60c30c1aac7342b94a86..27884dd708dfc32f8ee374deeb107d7c9ccabe93 100644 (file)
--- a/src/snmp_agent.h
+++ b/src/snmp_agent.h
@@ -13,6 +13,7 @@
 
 #if SQUID_SNMP
 
+#include "cache_snmp.h"
 #include "snmp_vars.h"
 
 variable_list *snmp_confFn(variable_list *, snint *);

diff --git a/src/snmp_core.h b/src/snmp_core.h
index f81355bb2be93adecb3022dbe8f7297e72dfa9ed..63d581edea43c2826df2b597e3dce35af5d1a1a1 100644 (file)
--- a/src/snmp_core.h
+++ b/src/snmp_core.h
@@ -13,17 +13,15 @@
 
 #include "cache_snmp.h"
 #include "comm/forward.h"
-#include "typedefs.h"
+#include "ip/forward.h"
+#include "typedefs.h" //for PF
 
-namespace Ip
-{
-class Address;
-}
 class MemBuf;
 
 #define SNMP_REQUEST_SIZE 4096
 #define MAX_PROTOSTAT 5
 
+typedef variable_list *(oid_ParseFn) (variable_list *, snint *);
 typedef struct _mib_tree_entry mib_tree_entry;
 typedef oid *(instance_Fn) (oid * name, snint * len, mib_tree_entry * current, oid_ParseFn ** Fn);
 typedef enum {atNone = 0, atSum, atAverage, atMax, atMin} AggrType;

diff --git a/src/typedefs.h b/src/typedefs.h
index c7849748ed41fa5a8fab411ed9ce80e4bd716701..a84e64348db0a1449e078833ba8fc2b227b989ec 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -16,11 +16,6 @@ typedef struct {
     size_t kb;
 } kb_t;
 
-#if SQUID_SNMP
-#include "cache_snmp.h"
-typedef variable_list *(oid_ParseFn) (variable_list *, snint *);
-#endif
-
 typedef void FREE(void *);
 typedef void PF(int, void *);