moved CURRENT_MIB_VERSION to cache_snmp.h

diff --git a/include/cache_snmp.h b/include/cache_snmp.h
index 6f53167ba55c98e6ec19af39e4214950db15bf59..9f6252d85bfc1cac2a6f50e7f9257b561bbf8bec 100644 (file)
--- a/include/cache_snmp.h
+++ b/include/cache_snmp.h
@@ -13,6 +13,10 @@
 
 /* mib stuff here */
 
+#ifndef CURRENT_MIB_VERSION
+#define CURRENT_MIB_VERSION "v 1.12 1998/03/16 kostas@nlanr.net"
+#endif
+
 /* MIB definitions
  * We start from the SQUIDMIB as the root of the subtree
  *

diff --git a/include/snmp_impl.h b/include/snmp_impl.h
index bcbd4795745373e79d01525cb6ac6cc350735d39..fd4af00a04e7d546998979036b68b0ddbf90ee45 100644 (file)
--- a/include/snmp_impl.h
+++ b/include/snmp_impl.h
@@ -74,11 +74,12 @@ SOFTWARE.
 #define RWRITE 0xAABA  /* add write access for community private */
 #define NOACCESS 0x0000        /* no access for anybody */
 
+#ifndef INTEGER
 #define INTEGER            ASN_INTEGER
 #define STRING     ASN_OCTET_STR
 #define OBJID      ASN_OBJECT_ID
 #define NULLOBJ            ASN_NULL
-
+#endif
 
 struct trapVar {
     oid            *varName;

diff --git a/include/version.h b/include/version.h
index 7001298add1552f115f9e097c9a9d1167e16f78c..d8bf6b5b4bd057d3e6776125a46adeb99ee101ea 100644 (file)
--- a/include/version.h
+++ b/include/version.h
@@ -1,5 +1,5 @@
 /*
- * $Id: version.h,v 1.109 1998/03/17 05:31:01 kostas Exp $
+ * $Id: version.h,v 1.110 1998/03/17 06:14:30 kostas Exp $
  *
  *  SQUID_VERSION - String for version id of this distribution
  */
@@ -10,7 +10,3 @@
 #ifndef SQUID_RELEASE_TIME
 #define SQUID_RELEASE_TIME squid_curtime
 #endif
-
-#ifndef CURRENT_MIB_VERSION
-#define CURRENT_MIB_VERSION "v 1.12 1998/03/16 kostas@nlanr.net"
-#endif

diff --git a/snmplib/parse.c b/snmplib/parse.c
index 4763da788f2c251b37c8020f98eeb235c67ccc3c..70ea36a5645ca0fea7355dd614eaa4e58e41810c 100644 (file)
--- a/snmplib/parse.c
+++ b/snmplib/parse.c
@@ -83,6 +83,7 @@ SOFTWARE.
 
 #include "util.h"
 
+#include "cache_snmp.h"
 /*
  * This is one element of an object identifier with either an integer subidentifier,
  * or a textual string label, or both.
@@ -113,8 +114,10 @@ int Line = 1;
 #define LABEL      1
 #define SUBTREE            2
 #define SYNTAX     3
+#undef OBJID
 #define OBJID      4
 #define OCTETSTR    5
+#undef INTEGER
 #define INTEGER            6
 #define NETADDR            7
 #define        IPADDR      8
@@ -130,6 +133,7 @@ int Line = 1;
 #define READONLY    18
 #define READWRITE   19
 #define        WRITEONLY   20
+#undef NOACCESS
 #define NOACCESS    21
 #define STATUS     22
 #define MANDATORY   23