--------------------- PatchSet 6877 Date: 2008/02/19 12:18:54 Author: amosjeffries Branch: cleanup Tag: (none) Log: More .h dependency fixes. Members: include/asn1.h:1.1.74.1->1.1.74.2 include/cache_snmp.h:1.4->1.4.4.1 include/md5.h:1.6->1.6.4.1 include/memMeter.h:1.3->1.3.42.1 include/parse.h:1.1->1.1.74.1 include/snmp.h:1.1->1.1.74.1 include/snmp_vars.h:1.2->1.2.4.1 Index: squid3/include/asn1.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/include/asn1.h,v retrieving revision 1.1.74.1 retrieving revision 1.1.74.2 diff -u -r1.1.74.1 -r1.1.74.2 --- squid3/include/asn1.h 19 Feb 2008 10:27:14 -0000 1.1.74.1 +++ squid3/include/asn1.h 19 Feb 2008 12:18:54 -0000 1.1.74.2 @@ -1,7 +1,6 @@ #ifndef SQUID_SNMP_ASN1_H #define SQUID_SNMP_ASN1_H -/* Squid autoconf definitions */ #include "config.h" /* @@ -31,7 +30,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. * - * $Id: asn1.h,v 1.1.74.1 2008/02/19 10:27:14 amosjeffries Exp $ + * $Id: asn1.h,v 1.1.74.2 2008/02/19 12:18:54 amosjeffries Exp $ * **********************************************************************/ Index: squid3/include/cache_snmp.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/include/cache_snmp.h,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -u -r1.4 -r1.4.4.1 --- squid3/include/cache_snmp.h 14 Dec 2007 23:50:56 -0000 1.4 +++ squid3/include/cache_snmp.h 19 Feb 2008 12:18:54 -0000 1.4.4.1 @@ -1,5 +1,5 @@ /* - * $Id: cache_snmp.h,v 1.4 2007/12/14 23:50:56 squidadm Exp $ + * $Id: cache_snmp.h,v 1.4.4.1 2008/02/19 12:18:54 amosjeffries Exp $ */ #ifndef SQUID_CACHE_SNMP_H @@ -19,7 +19,7 @@ #include "snmp.h" #include "snmp_impl.h" -#include "asn1.h" +/* #include "asn1.h" */ #include "snmp_api.h" #include "snmp_vars.h" Index: squid3/include/md5.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/include/md5.h,v retrieving revision 1.6 retrieving revision 1.6.4.1 diff -u -r1.6 -r1.6.4.1 --- squid3/include/md5.h 30 Nov 2007 04:51:21 -0000 1.6 +++ squid3/include/md5.h 19 Feb 2008 12:18:54 -0000 1.6.4.1 @@ -1,6 +1,8 @@ #ifndef SQUID_MD5_H #define SQUID_MD5_H +#include "config.h" + /* * This is the header file for the MD5 message-digest algorithm. * The algorithm is due to Ron Rivest. This code was Index: squid3/include/memMeter.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/include/memMeter.h,v retrieving revision 1.3 retrieving revision 1.3.42.1 diff -u -r1.3 -r1.3.42.1 --- squid3/include/memMeter.h 15 Sep 2005 02:12:42 -0000 1.3 +++ squid3/include/memMeter.h 19 Feb 2008 12:18:54 -0000 1.3.42.1 @@ -1,7 +1,11 @@ - +/* + * $Id: memMeter.h,v 1.3.42.1 2008/02/19 12:18:54 amosjeffries Exp $ + */ #ifndef _MEM_METER_H_ #define _MEM_METER_H_ +#include "config.h" + /* object to track per-action memory usage (e.g. #idle objects) */ class MemMeter { public: Index: squid3/include/parse.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/include/parse.h,v retrieving revision 1.1 retrieving revision 1.1.74.1 diff -u -r1.1 -r1.1.74.1 --- squid3/include/parse.h 14 Oct 2002 00:18:18 -0000 1.1 +++ squid3/include/parse.h 19 Feb 2008 12:18:54 -0000 1.1.74.1 @@ -1,7 +1,6 @@ /* - * $Id: parse.h,v 1.1 2002/10/14 00:18:18 squidadm Exp $ + * $Id: parse.h,v 1.1.74.1 2008/02/19 12:18:54 amosjeffries Exp $ */ - #ifndef SQUID_PARSE_H #define SQUID_PARSE_H @@ -26,11 +25,12 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* - * parse.h - */ -/* +/* NP: we only need struct variable_list and typedef oid from SNMP library */ +/* we use as ptrs. If this was true C++ we could pre-define their classes. */ +#include "snmp_vars.h" + +/** * A linked list of tag-value pairs for enumerated integers. */ struct enum_list { @@ -39,7 +39,7 @@ char *label; }; -/* +/** * A tree in the format of the tree structure of the MIB. */ struct snmp_mib_tree { @@ -63,7 +63,7 @@ #define TYPE_COUNTER 6 #define TYPE_GAUGE 7 #define TYPE_TIMETICKS 8 -#define TYPE_OPAQUE 9 +#define TYPE_OPAQUE 9 #define TYPE_NULL 10 #ifdef __cplusplus Index: squid3/include/snmp.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/include/snmp.h,v retrieving revision 1.1 retrieving revision 1.1.74.1 diff -u -r1.1 -r1.1.74.1 --- squid3/include/snmp.h 14 Oct 2002 00:18:18 -0000 1.1 +++ squid3/include/snmp.h 19 Feb 2008 12:18:54 -0000 1.1.74.1 @@ -27,7 +27,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. * - * $Id: snmp.h,v 1.1 2002/10/14 00:18:18 squidadm Exp $ + * $Id: snmp.h,v 1.1.74.1 2008/02/19 12:18:54 amosjeffries Exp $ * **********************************************************************/ @@ -39,7 +39,9 @@ #endif /* These come first */ +#if 0 #include "asn1.h" +#endif #include "snmp_error.h" #if 0 #include "mibii.h" Index: squid3/include/snmp_vars.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/include/snmp_vars.h,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -r1.2 -r1.2.4.1 --- squid3/include/snmp_vars.h 14 Dec 2007 23:50:56 -0000 1.2 +++ squid3/include/snmp_vars.h 19 Feb 2008 12:18:54 -0000 1.2.4.1 @@ -25,10 +25,12 @@ * * Author: Ryan Troll * - * $Id: snmp_vars.h,v 1.2 2007/12/14 23:50:56 squidadm Exp $ + * $Id: snmp_vars.h,v 1.2.4.1 2008/02/19 12:18:54 amosjeffries Exp $ * **********************************************************************/ +#include "asn1.h" + #ifdef __cplusplus extern "C" { #endif