eliminate non-gcc warnings, especially about multiply defined symbols

diff --git a/src/globals.h b/src/globals.h
index 20ca3bd769cb5c5cddaaa62d6522da4ba8d80e45..362de3bdd6568ca9579de03681966819f89f82fe 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: globals.h,v 1.42 1998/03/07 23:43:07 rousskov Exp $
+ * $Id: globals.h,v 1.43 1998/03/16 20:30:03 wessels Exp $
  */
 
 extern FILE *debug_log;                /* NULL */
@@ -93,7 +93,6 @@ extern StatCounters Counter;
 extern char *err_type_str[];
 extern char *icp_opcode_str[];
 extern char *swap_log_op_str[];
-extern struct radix_node_head *AS_tree_head;
 extern double request_failure_ratio;   /* 0.0 */
 extern int store_hash_buckets; /* 0 */
 extern hash_table *store_table;        /* NULL */
@@ -104,7 +103,3 @@ extern int hot_obj_count;   /* 0 */
 #ifdef HAVE_SYSLOG
 extern int _db_level;
 #endif
-
-#if SQUID_SNMP
-extern struct tree *Mib;
-#endif

diff --git a/src/snmp_agent.cc b/src/snmp_agent.cc
index 069a5d9e1faf7ff96eb9337f01f262d24892a475..ceb485f64af81942907c3cd627006a607604217f 100644 (file)
--- a/src/snmp_agent.cc
+++ b/src/snmp_agent.cc
@@ -72,7 +72,7 @@ snmpAclCheckStart(snmp_request_t * rq)
 {
     communityEntry *cp;
     for (cp = Config.Snmp.communities; cp != NULL; cp = cp->next)
-       if (!strcmp((char *)rq->community, cp->name) && cp->acls) {
+       if (!strcmp((char *) rq->community, cp->name) && cp->acls) {
            rq->acl_checklist = aclChecklistCreate(cp->acls,
                NULL, rq->from.sin_addr, NULL, NULL);
            aclNBCheck(rq->acl_checklist, snmpAclCheckDone, rq);
@@ -111,14 +111,14 @@ snmpAclCheckDone(int answer, void *data)
        debug(49, 5) ("snmpAclCheckDone: checking.\n");
        /* access check for each variable */
 
-       if (!community_check((char *)Community, VarPtr->name, VarPtr->name_length)) {
+       if (!community_check((char *) Community, VarPtr->name, VarPtr->name_length)) {
            debug(49, 5) ("snmpAclCheckDone: failed on community_check.\n");
            snmp_agent_parse_done(0, rq);
            return;
        }
     }
     Session->community = Community;
-    Session->community_len = strlen((char *)Community);
+    Session->community_len = strlen((char *) Community);
     RespPDU = snmp_agent_response(PDU);
     snmp_free_pdu(PDU);
     if (RespPDU == NULL) {

diff --git a/src/squid.h b/src/squid.h
index 4c12ac9054da777152e168b104c0694df88baeb9..49f501b637063cc130c4fdae96eb8751e12d8e11 100644 (file)
--- a/src/squid.h
+++ b/src/squid.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: squid.h,v 1.163 1998/03/08 08:43:16 rousskov Exp $
+ * $Id: squid.h,v 1.164 1998/03/16 20:30:05 wessels Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -353,4 +353,8 @@ struct rusage {
 #define calloc +
 #define sprintf +
 #define strdup +
+
+#if SQUID_SNMP
+extern struct snmp_mib_tree *Mib;
+#endif
 #endif /* SQUID_H */