---------------------
PatchSet 2121 
Date: 2001/04/27 14:53:50
Author: rbcollins
Branch: rbcollins_filters
Tag: (none) 
Log:
doh! missed a compile bug

Members: 
	src/acl.c:1.1.1.3.8.8.4.9->1.1.1.3.8.8.4.10 
	src/structs.h:1.1.1.3.4.1.4.12.2.25->1.1.1.3.4.1.4.12.2.26 

Index: squid/src/acl.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/acl.c,v
retrieving revision 1.1.1.3.8.8.4.9
retrieving revision 1.1.1.3.8.8.4.10
diff -u -r1.1.1.3.8.8.4.9 -r1.1.1.3.8.8.4.10
--- squid/src/acl.c	27 Apr 2001 14:38:37 -0000	1.1.1.3.8.8.4.9
+++ squid/src/acl.c	27 Apr 2001 14:53:50 -0000	1.1.1.3.8.8.4.10
@@ -1,6 +1,6 @@
 
 /*
- * $Id: acl.c,v 1.1.1.3.8.8.4.9 2001/04/27 14:38:37 rbcollins Exp $
+ * $Id: acl.c,v 1.1.1.3.8.8.4.10 2001/04/27 14:53:50 rbcollins Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -143,7 +143,9 @@
 static ACLMATCH aclMatchMaxConn;
 static ACLMATCH aclMatchUrlPort;
 static ACLMATCH aclMatchMyPort;
+#if SQUID_SNMP
 static ACLMATCH aclMatchSNMPCommunity;
+#endif
 static ACLMATCH aclMatchProto;
 static ACLMATCH aclMatchMethod;
 static ACLMATCH aclMatchSrcAsn;
@@ -2882,7 +2884,9 @@
     parserRegisterType("intlist", aclParseIntRange, free_intlist, dump_intlistList);
     parserRegisterType("intrange", aclParseIntRange, aclDestroyIntRange, dump_IntRangeList);
     parserRegisterType("userlist", aclParseUserList, aclDestroyUserList, dump_UserList);
+#if SQUID_SNMP
     parserRegisterType("aclwordlist", aclParseWordList, free_wordlist, dump_wordlist);
+#endif
     parserRegisterType("protolist", aclParseProtoList, free_intlist, dump_ProtoList);
     parserRegisterType("methodlist", aclParseMethodList, free_intlist, dump_MethodList);
 #if 0
@@ -2923,7 +2927,9 @@
     aclRegisterAclName("port", parserTypeByName("intrange"), aclMatchUrlPort);
     aclRegisterAclName("myport", parserTypeByName("intrange"), aclMatchMyPort);
 
+#if SQUID_SNMP
     aclRegisterAclName("snmp_community", parserTypeByName("aclwordlist"), aclMatchSNMPCommunity);
+#endif
 
     aclRegisterAclName("proto", parserTypeByName("protolist"), aclMatchProto);
     aclRegisterAclName("method", parserTypeByName("methodlist"), aclMatchMethod);
Index: squid/src/structs.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/structs.h,v
retrieving revision 1.1.1.3.4.1.4.12.2.25
retrieving revision 1.1.1.3.4.1.4.12.2.26
diff -u -r1.1.1.3.4.1.4.12.2.25 -r1.1.1.3.4.1.4.12.2.26
--- squid/src/structs.h	27 Apr 2001 14:39:05 -0000	1.1.1.3.4.1.4.12.2.25
+++ squid/src/structs.h	27 Apr 2001 14:53:51 -0000	1.1.1.3.4.1.4.12.2.26
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.1.1.3.4.1.4.12.2.25 2001/04/27 14:39:05 rbcollins Exp $
+ * $Id: structs.h,v 1.1.1.3.4.1.4.12.2.26 2001/04/27 14:53:51 rbcollins Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -31,6 +31,9 @@
  *
  */
 
+#ifndef _STRUCTS_H_
+#define _STRUCTS_H_
+
 #include "config.h"
 #include "splay.h"
 /* FIXME: remove this - no global structures should refer to the parser library */
@@ -228,51 +231,6 @@
     sockaddr_in_list *next;
 };
 
-struct _instance_name {
-    dlink_node node;
-    dlink_list instances;
-    char *namestr;
-    parserTypeNode *type;
-    PARSER_DEFAULT_NONE  *default_none;
-    PARSER_NAME_DOCUMENT *documentfunc;
-    PARSER_POST_PARSE    *post_parse_func;
-};
-
-struct _instance_node {
-    dlink_node node;
-    dlink_list *head;
-    char *namestr;
-    void *data;
-    parserNameNode *parserName;
-    instance_name *name;
-};
-
-struct _parserTypeNode {
-    dlink_node node;
-    const char *typestr;
-    PARSER_PARSE *parsefunc;
-    PARSER_FREE  *freefunc;
-    PARSER_DUMP  *dumpfunc;
-    struct {
-        unsigned int registered:1;
-    } flags;
-};
-
-struct _parserNameNode {
-    dlink_node node;
-    dlink_list children;
-    dlink_list *head;
-    const char *namestr;
-    parserTypeNode *type;
-    PARSER_DEFAULT_NONE  *default_none;
-    PARSER_NAME_DOCUMENT *documentfunc;
-    PARSER_POST_PARSE    *post_parse_func;
-    void *location;
-    struct {
-        unsigned int registered:1;
-    } flags;
-};
-
 struct _modNode {
     dlink_node node;
     char *namestr;
@@ -2172,3 +2130,5 @@
     char *name;
     void (*parse) (SwapDir * sd, const char *option, const char *value, int reconfiguring);
 };
+
+#endif /* _STRUCTS_H */