---------------------
PatchSet 1797 
Date: 2001/03/31 09:11:45
Author: rbcollins
Branch: rbcollins_filters
Tag: (none) 
Log:
Missed a merge conflict.

Members: 
	src/typedefs.h:1.1.1.3.8.7.4.19->1.1.1.3.8.7.4.20 

Index: squid/src/typedefs.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/typedefs.h,v
retrieving revision 1.1.1.3.8.7.4.19
retrieving revision 1.1.1.3.8.7.4.20
diff -u -r1.1.1.3.8.7.4.19 -r1.1.1.3.8.7.4.20
--- squid/src/typedefs.h	31 Mar 2001 09:09:43 -0000	1.1.1.3.8.7.4.19
+++ squid/src/typedefs.h	31 Mar 2001 09:11:45 -0000	1.1.1.3.8.7.4.20
@@ -1,6 +1,6 @@
 
 /*
- * $Id: typedefs.h,v 1.1.1.3.8.7.4.19 2001/03/31 09:09:43 rbcollins Exp $
+ * $Id: typedefs.h,v 1.1.1.3.8.7.4.20 2001/03/31 09:11:45 rbcollins Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -396,13 +396,4 @@
 /* config, namestr, param_str */
 typedef void FILTERPARSE(void *,const char *, char *);
 
-/* modules.c */
-typedef struct _modConfig modConfig;
-typedef struct _modNode modNode;
-
-/* name to register under */
-typedef void MOD_INSTALL(const char *);
-typedef unsigned int MOD_UNINSTALL(const char *);
-
-
 #endif /* _TYPEDEFS_H_ */