From: hno <>
Date: Mon, 8 Oct 2001 22:18:31 +0000 (+0000)
Subject: Bugzilla #11: Some Header Files Not Wrapped Or Wrapped Improperly
X-Git-Tag: SQUID_3_0_PRE1~1370
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5638623e5e992a16ccf96a9dad1e2aaa353fa6c;p=thirdparty%2Fsquid.git

Bugzilla #11: Some Header Files Not Wrapped Or Wrapped Improperly
---

diff --git a/include/Array.h b/include/Array.h
index ac87defa5a..09b619a65d 100644
--- a/include/Array.h
+++ b/include/Array.h
@@ -1,5 +1,5 @@
 /*
- * $Id: Array.h,v 1.5 2001/02/07 18:56:50 hno Exp $
+ * $Id: Array.h,v 1.6 2001/10/08 16:18:31 hno Exp $
  *
  * AUTHOR: Alex Rousskov
  *
@@ -31,8 +31,8 @@
  *  
  */
 
-#ifndef _ARRAY_H_
-#define _ARRAY_H_
+#ifndef SQUID_ARRAY_H
+#define SQUID_ARRAY_H
 
 /* see Array.c for more documentation */
 
@@ -51,4 +51,4 @@ extern void arrayAppend(Array * s, void *obj);
 extern void arrayPreAppend(Array * s, int app_count);
 
 
-#endif /* ndef _ARRAY_H_ */
+#endif /* SQUID_ARRAY_H */
diff --git a/include/GNUregex.h b/include/GNUregex.h
index d234dc3201..048b921433 100644
--- a/include/GNUregex.h
+++ b/include/GNUregex.h
@@ -1,7 +1,10 @@
 /*
- * $Id: GNUregex.h,v 1.6 1999/01/11 21:55:33 wessels Exp $
+ * $Id: GNUregex.h,v 1.7 2001/10/08 16:18:31 hno Exp $
  */
 
+#ifndef SQUID_REGEXP_LIBRARY_H
+#define SQUID_REGEXP_LIBRARY_H
+
 /* Definitions for data structures and routines for the regular
  * expression library, version 0.12.
  * 
@@ -21,9 +24,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.  */
 
-#ifndef __REGEXP_LIBRARY_H__
-#define __REGEXP_LIBRARY_H__
-
 /* POSIX says that <sys/types.h> must be included (by the caller) before
  * <regex.h>.  */
 
@@ -479,7 +479,7 @@ extern size_t regerror
 	size_t errbuf_size));
 extern void regfree _RE_ARGS((regex_t * preg));
 
-#endif /* not __REGEXP_LIBRARY_H__ */
+#endif /* SQUID_REGEXP_LIBRARY_H */
 
 /*
  * Local variables:
diff --git a/include/Stack.h b/include/Stack.h
index 42365e3382..e1374685a4 100644
--- a/include/Stack.h
+++ b/include/Stack.h
@@ -1,5 +1,5 @@
 /*
- * $Id: Stack.h,v 1.10 2001/01/12 00:37:12 wessels Exp $
+ * $Id: Stack.h,v 1.11 2001/10/08 16:18:31 hno Exp $
  *
  * AUTHOR: Alex Rousskov
  *
@@ -31,8 +31,8 @@
  *  
  */
 
-#ifndef _STACK_H_
-#define _STACK_H_
+#ifndef SQUID_STACK_H
+#define SQUID_STACK_H
 
 #include "Array.h"
 
@@ -47,4 +47,4 @@ extern void *stackPop(Stack * s);
 #define stackPrePush arrayPreAppend
 extern void *stackTop(Stack * s);
 
-#endif /* ndef _STACK_H_ */
+#endif /* SQUID_STACK_H */
diff --git a/include/asn1.h b/include/asn1.h
index 25bd4566ab..4c6792701c 100644
--- a/include/asn1.h
+++ b/include/asn1.h
@@ -1,5 +1,5 @@
-#ifndef _SNMP_ASN1_H_
-#define _SNMP_ASN1_H_
+#ifndef SQUID_SNMP_ASN1_H
+#define SQUID_SNMP_ASN1_H
 
 /*
  * Definitions for Abstract Syntax Notation One, ASN.1
@@ -28,7 +28,7 @@
  * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  * 
- * $Id: asn1.h,v 1.11 2001/01/07 09:55:21 hno Exp $
+ * $Id: asn1.h,v 1.12 2001/10/08 16:18:31 hno Exp $
  * 
  **********************************************************************/
 
@@ -98,4 +98,5 @@ extern "C" {
 }
 
 #endif
-#endif				/* _SNMP_ASN1_H_ */
+
+#endif	/* SQUID_SNMP_ASN1_H */
diff --git a/include/cache_snmp.h b/include/cache_snmp.h
index ebb35c69ef..59e9a03c06 100644
--- a/include/cache_snmp.h
+++ b/include/cache_snmp.h
@@ -1,10 +1,11 @@
 /*
- * $Id: cache_snmp.h,v 1.24 1999/06/11 22:40:32 wessels Exp $
+ * $Id: cache_snmp.h,v 1.25 2001/10/08 16:18:31 hno Exp $
  */
 
+#ifndef SQUID_SNMP_H
+#define SQUID_SNMP_H
+
 #ifdef SQUID_SNMP
-#ifndef CACHE_SNMP_H
-#define CACHE_SNMP_H
 
 #if SIZEOF_LONG == 8
 #define snint int
@@ -253,5 +254,6 @@ enum {
     PERF_MEDIAN_END
 };
 
-#endif
-#endif
+#endif /* SQUID_SNMP */
+
+#endif /* SQUID_SNMP_H */
diff --git a/include/config.h b/include/config.h
index ca95a08e3c..18569f509e 100644
--- a/include/config.h
+++ b/include/config.h
@@ -1,5 +1,5 @@
 /*
- * $Id: config.h,v 1.1 2001/09/25 23:45:15 robertc Exp $
+ * $Id: config.h,v 1.2 2001/10/08 16:18:31 hno Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -31,8 +31,8 @@
  *  
  */
 
-#ifndef _CONFIG_H_
-#define _CONFIG_H_
+#ifndef SQUID_CONFIG_H
+#define SQUID_CONFIG_H
 
 #include "autoconf.h"	/* For GNU autoconf variables */
 #include "version.h"
@@ -175,4 +175,4 @@
 #define squid_srandom srand
 #endif
 
-#endif /* _CONFIG_H_ */
+#endif /* SQUID_CONFIG_H */
diff --git a/include/hash.h b/include/hash.h
index 00c703e42a..9ed88beffd 100644
--- a/include/hash.h
+++ b/include/hash.h
@@ -1,7 +1,10 @@
 /*
- * $Id: hash.h,v 1.4 2000/10/31 23:48:08 wessels Exp $
+ * $Id: hash.h,v 1.5 2001/10/08 16:18:31 hno Exp $
  */
 
+#ifndef SQUID_HASH_H
+#define SQUID_HASH_H
+
 typedef void HASHFREE(void *);
 typedef int HASHCMP(const void *, const void *);
 typedef unsigned int HASHHASH(const void *, unsigned int);
@@ -56,3 +59,5 @@ extern const char *hashKeyStr(hash_link *);
  *  HASH_SIZE 65357             // prime number < 65536
  */
 #define  DEFAULT_HASH_SIZE 7951	/* prime number < 8192 */
+
+#endif /* SQUID_HASH_H */
diff --git a/include/heap.h b/include/heap.h
index fac9c392c0..28cb86953e 100644
--- a/include/heap.h
+++ b/include/heap.h
@@ -1,5 +1,5 @@
 /*
- * $Id: heap.h,v 1.3 2001/01/12 00:37:12 wessels Exp $
+ * $Id: heap.h,v 1.4 2001/10/08 16:18:31 hno Exp $
  *
  * AUTHOR: John Dilley, Hewlett Packard
  *
@@ -41,8 +41,8 @@
  * are larger than their parent.
  ****************************************************************************/
 
-#ifndef	_heap_h_INCLUDED
-#define	_heap_h_INCLUDED
+#ifndef	SQUID_HEAP_H
+#define	SQUID_HEAP_H
 
 /*
  * Function for generating heap keys.  The first argument will typically be
@@ -175,4 +175,4 @@ extern void heap_printnode(char *msg, heap_node * elm);
 
 extern int verify_heap_property(heap *);
 
-#endif /* _heap_h_INCLUDED */
+#endif /* SQUID_HEAP_H */
diff --git a/include/md5.h b/include/md5.h
index ab8d072e61..3e29aa250c 100644
--- a/include/md5.h
+++ b/include/md5.h
@@ -1,9 +1,9 @@
 /*
- * $Id: md5.h,v 1.9 2001/04/14 00:03:20 hno Exp $
+ * $Id: md5.h,v 1.10 2001/10/08 16:18:31 hno Exp $
  */
 
-#ifndef MD5_H
-#define MD5_H
+#ifndef SQUID_MD5_H
+#define SQUID_MD5_H
 
 #if USE_OPENSSL
 
@@ -63,4 +63,5 @@ void MD5Final(unsigned char[16], MD5_CTX *);
 #define MD5_DIGEST_CHARS         16
 
 #endif /* USE_OPENSSL */
-#endif /* MD5_H */
+
+#endif /* SQUID_MD5_H */
diff --git a/include/ntlmauth.h b/include/ntlmauth.h
index 42bc6fe700..2d206047af 100644
--- a/include/ntlmauth.h
+++ b/include/ntlmauth.h
@@ -1,5 +1,5 @@
 /*
- * $Id: ntlmauth.h,v 1.5 2001/08/29 14:57:33 robertc Exp $
+ * $Id: ntlmauth.h,v 1.6 2001/10/08 16:18:31 hno Exp $
  *
  * * * * * * * * Legal stuff * * * * * * *
  *
@@ -50,8 +50,8 @@
  * It's put here as it is a common utility to all HTLM-enabled modules.
  */
 
-#ifndef _NTLMAUTH_H_
-#define _NTLMAUTH_H_
+#ifndef SQUID_NTLMAUTH_H
+#define SQUID_NTLMAUTH_H
 
 /* int*_t */
 #include "squid_types.h"
@@ -180,4 +180,4 @@ void ntlm_add_to_payload(char *payload, int *payload_length,
     strhdr * hdr, char *toadd,
     int toadd_length, int base_offset);
 
-#endif /* _NTLMAUTH_H_ */
+#endif /* SQUID_NTLMAUTH_H */
diff --git a/include/parse.h b/include/parse.h
index 8dd6397fc5..eff4c142b4 100644
--- a/include/parse.h
+++ b/include/parse.h
@@ -1,9 +1,9 @@
 /*
- * $Id: parse.h,v 1.9 2001/05/10 07:17:34 hno Exp $
+ * $Id: parse.h,v 1.10 2001/10/08 16:18:31 hno Exp $
  */
 
-#ifndef _HAVE_PARSE_H_
-#define _HAVE_PARSE_H_
+#ifndef SQUID_PARSE_H
+#define SQUID_PARSE_H
 
 /***********************************************************
 	Copyright 1989 by Carnegie Mellon University
@@ -90,4 +90,5 @@ extern "C" {
 }
 
 #endif
-#endif				/* _HAVE_PARSE_H_ */
+
+#endif				/* SQUID_PARSE_H */
diff --git a/include/radix.h b/include/radix.h
index 5101e8c080..49d756c94e 100644
--- a/include/radix.h
+++ b/include/radix.h
@@ -1,7 +1,10 @@
 /*
- * $Id: radix.h,v 1.9 2001/02/07 19:04:04 hno Exp $
+ * $Id: radix.h,v 1.10 2001/10/08 16:18:31 hno Exp $
  */
 
+#ifndef SQUID_RADIX_H
+#define	SQUID_RADIX_H
+
 /*
  * Copyright (c) 1988, 1989, 1993
  *      The Regents of the University of California.  All rights reserved.
@@ -37,8 +40,6 @@
  *      @(#)radix.h     8.2 (Berkeley) 10/31/94
  */
 
-#ifndef _RADIX_H_
-#define	_RADIX_H_
 #undef RN_DEBUG
 #ifndef __P
 #define __P(x) x
@@ -155,4 +156,5 @@ struct radix_node
           *rn_search_m __P((void *, struct radix_node *, void *));
 extern struct radix_node *rn_lookup(void *, void *, struct radix_node_head *);
 #define min(x,y) ((x)<(y)? (x) : (y))
-#endif /* _RADIX_H_ */
+
+#endif /* SQUID_RADIX_H */
diff --git a/include/rfc1035.h b/include/rfc1035.h
index 67b15ee643..db17ecd690 100644
--- a/include/rfc1035.h
+++ b/include/rfc1035.h
@@ -1,5 +1,5 @@
 /*
- * $Id: rfc1035.h,v 1.5 2001/01/12 00:37:12 wessels Exp $
+ * $Id: rfc1035.h,v 1.6 2001/10/08 16:18:31 hno Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -31,8 +31,8 @@
  *  
  */
 
-#ifndef _RFC1035_H_
-#define _RFC1035_H_
+#ifndef SQUID_RFC1035_H
+#define SQUID_RFC1035_H
 
 #include "config.h"
 #if HAVE_SYS_TYPES_H
@@ -75,4 +75,4 @@ extern const char *rfc1035_error_message;
 #define RFC1035_TYPE_PTR 12
 #define RFC1035_CLASS_IN 1
 
-#endif /* ndef _RFC1035_H_ */
+#endif /* SQUID_RFC1035_H */
diff --git a/include/rfc2617.h b/include/rfc2617.h
index bdeac3faa2..7136d8f74a 100644
--- a/include/rfc2617.h
+++ b/include/rfc2617.h
@@ -14,7 +14,7 @@
 
 
 /*
- * $Id: rfc2617.h,v 1.2 2001/04/14 00:03:20 hno Exp $
+ * $Id: rfc2617.h,v 1.3 2001/10/08 16:18:31 hno Exp $
  *
  * DEBUG:
  * AUTHOR: RFC 2617 & Robert Collins
@@ -47,8 +47,8 @@
  *
  */
 
-#ifndef RFC2617_H
-#define RFC2617_H
+#ifndef SQUID_RFC2617_H
+#define SQUID_RFC2617_H
 
 #define HASHLEN 16
 typedef char HASH[HASHLEN];
@@ -84,4 +84,4 @@ void CvtHex(const HASH Bin, HASHHEX Hex);
 
 void CvtBin(const HASHHEX Hex, HASH Bin);
 
-#endif /* RFC 2617 */
+#endif /* SQUID_RFC2617_H */
diff --git a/include/snmp-internal.h b/include/snmp-internal.h
index 954fe91981..2da0b22e3a 100644
--- a/include/snmp-internal.h
+++ b/include/snmp-internal.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
-#ifndef _SNMP_INTERNAL_H_
-#define _SNMP_INTERNAL_H_
+#ifndef SQUID_SNMP_INTERNAL_H
+#define SQUID_SNMP_INTERNAL_H
 
 /**********************************************************************
  *
@@ -24,7 +24,7 @@
  * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  * 
- * $Id: snmp-internal.h,v 1.2 2001/05/19 17:56:41 hno Exp $
+ * $Id: snmp-internal.h,v 1.3 2001/10/08 16:18:31 hno Exp $
  * 
  **********************************************************************/
 
@@ -32,4 +32,4 @@
 #define SNMP_TRAP_PORT	    162
 #define SNMP_MAX_LEN	    484
 
-#endif /* _SNMP_INTERNAL_H_ */
+#endif /* SQUID_SNMP_INTERNAL_H */
diff --git a/include/snmp-mib.h b/include/snmp-mib.h
index 0a8def2f2d..71ca7b9c01 100644
--- a/include/snmp-mib.h
+++ b/include/snmp-mib.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
-#ifndef _SNMP_MIB_H_
-#define _SNMP_MIB_H_
+#ifndef SQUID_SNMP_MIB_H
+#define SQUID_SNMP_MIB_H
 
 /***************************************************************************
  *
@@ -26,7 +26,7 @@
  * 
  * Author: Ryan Troll <ryan+@andrew.cmu.edu>
  * 
- * $Id: snmp-mib.h,v 1.2 1998/04/04 01:43:42 kostas Exp $
+ * $Id: snmp-mib.h,v 1.3 2001/10/08 16:18:31 hno Exp $
  * 
  ***************************************************************************/
 
@@ -35,4 +35,5 @@
 #if 0
 #include <mib.h>		/* Then the function definitions */
 #endif
-#endif /* _SNMP_MIB_H_ */
+
+#endif /* SQUID_SNMP_MIB_H */
diff --git a/include/snmp.h b/include/snmp.h
index 849c765bed..92ae4c8b07 100644
--- a/include/snmp.h
+++ b/include/snmp.h
@@ -1,5 +1,5 @@
-#ifndef _SNMP_H_
-#define _SNMP_H_
+#ifndef SQUID_SNMP_H
+#define SQUID_SNMP_H
 
 /*
  * Definitions for the Simple Network Management Protocol (RFC 1067).
@@ -27,7 +27,7 @@
  * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  * 
- * $Id: snmp.h,v 1.13 1998/04/04 01:43:42 kostas Exp $
+ * $Id: snmp.h,v 1.14 2001/10/08 16:18:31 hno Exp $
  * 
  **********************************************************************/
 
@@ -72,4 +72,4 @@
 #include "snmp_compat.h"
 #include "snmp_debug.h"
 
-#endif /* _SNMP_H_ */
+#endif /* SQUID_SNMP_H */
diff --git a/include/snmp_api.h b/include/snmp_api.h
index beafe2d4c9..e8a13131b3 100644
--- a/include/snmp_api.h
+++ b/include/snmp_api.h
@@ -1,9 +1,9 @@
 /*
- * $Id: snmp_api.h,v 1.11 1998/09/23 17:20:01 wessels Exp $
+ * $Id: snmp_api.h,v 1.12 2001/10/08 16:18:31 hno Exp $
  */
 
-#ifndef _SNMP_API_H_
-#define _SNMP_API_H_
+#ifndef SQUID_SNMP_API_H
+#define SQUID_SNMP_API_H
 
 #include "config.h"
 #ifdef HAVE_SYS_TIME_H
@@ -187,4 +187,5 @@ extern "C" {
 }
 
 #endif
-#endif				/* _SNMP_API_H_ */
+
+#endif				/* SQUID_SNMP_API_H */
diff --git a/include/snmp_api_error.h b/include/snmp_api_error.h
index 4cb8135e11..7831c10259 100644
--- a/include/snmp_api_error.h
+++ b/include/snmp_api_error.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
-#ifndef _SNMP_API_ERROR_H_
-#define _SNMP_API_ERROR_H_
+#ifndef SQUID_SNMP_API_ERROR_H
+#define SQUID_SNMP_API_ERROR_H
 
 /***************************************************************************
  *
@@ -26,7 +26,7 @@
  * 
  * Author: Ryan Troll <ryan+@andrew.cmu.edu>
  * 
- * $Id: snmp_api_error.h,v 1.2 1998/04/04 01:43:43 kostas Exp $
+ * $Id: snmp_api_error.h,v 1.3 2001/10/08 16:18:31 hno Exp $
  * 
  ***************************************************************************/
 
@@ -67,4 +67,5 @@ extern "C" {
 }
 
 #endif
-#endif				/* _SNMP_API_ERROR_H_ */
+
+#endif				/* SQUID_SNMP_API_ERROR_H */
diff --git a/include/snmp_api_util.h b/include/snmp_api_util.h
index a305171672..cb1f1884e0 100644
--- a/include/snmp_api_util.h
+++ b/include/snmp_api_util.h
@@ -1,9 +1,9 @@
 /*
- * $Id: snmp_api_util.h,v 1.3 1998/09/23 17:20:01 wessels Exp $
+ * $Id: snmp_api_util.h,v 1.4 2001/10/08 16:18:31 hno Exp $
  */
 
-#ifndef _SNMP_API_UTIL_H_
-#define _SNMP_API_UTIL_H_
+#ifndef SQUID_SNMP_API_UTIL_H
+#define SQUID_SNMP_API_UTIL_H
 
 /***********************************************************
 	Copyright 1997 by Carnegie Mellon University
@@ -94,4 +94,5 @@ extern "C" {
 }
 
 #endif
-#endif				/* _SNMP_API_UTIL_H_ */
+
+#endif				/* SQUID_SNMP_API_UTIL_H */
diff --git a/include/snmp_client.h b/include/snmp_client.h
index 8184ae364d..e269f3ba1f 100644
--- a/include/snmp_client.h
+++ b/include/snmp_client.h
@@ -1,9 +1,9 @@
 /*
- * $Id: snmp_client.h,v 1.7 2001/01/07 09:55:22 hno Exp $
+ * $Id: snmp_client.h,v 1.8 2001/10/08 16:18:31 hno Exp $
  */
 
-#ifndef _SNMP_CLIENT_H_
-#define _SNMP_CLIENT_H_
+#ifndef SQUID_SNMP_CLIENT_H
+#define SQUID_SNMP_CLIENT_H
 
 /*
  * snmp_client.h
@@ -59,6 +59,6 @@ extern "C" {
 
 #ifdef __cplusplus
 }
-
 #endif
-#endif				/* _SNMP_CLIENT_H_ */
+
+#endif				/* SQUID_SNMP_CLIENT_H */
diff --git a/include/snmp_coexist.h b/include/snmp_coexist.h
index f32de2cf97..b150944417 100644
--- a/include/snmp_coexist.h
+++ b/include/snmp_coexist.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
-#ifndef _SNMP_COEXISTANCE_H_
-#define _SNMP_COEXISTANCE_H_
+#ifndef SQUID_SNMP_COEXISTANCE_H
+#define SQUID_SNMP_COEXISTANCE_H
 
 /**********************************************************************
  *
@@ -26,7 +26,7 @@
  * 
  * Author: Ryan Troll <ryan+@andrew.cmu.edu>
  * 
- * $Id: snmp_coexist.h,v 1.2 1998/04/04 01:43:44 kostas Exp $
+ * $Id: snmp_coexist.h,v 1.3 2001/10/08 16:18:31 hno Exp $
  * 
  **********************************************************************/
 
@@ -39,6 +39,6 @@ extern "C" {
 
 #ifdef __cplusplus
 }
-
 #endif
-#endif				/* _SNMP_COEXISTANCE_H_ */
+
+#endif				/* SQUID_SNMP_COEXISTANCE_H */
diff --git a/include/snmp_debug.h b/include/snmp_debug.h
index 154dab8bef..f08bc59aa6 100644
--- a/include/snmp_debug.h
+++ b/include/snmp_debug.h
@@ -1,9 +1,9 @@
 /*
- * $Id: snmp_debug.h,v 1.6 1999/01/11 21:55:34 wessels Exp $
+ * $Id: snmp_debug.h,v 1.7 2001/10/08 16:18:31 hno Exp $
  */
 
-#ifndef SNMP_DEBUG_H
-#define SNMP_DEBUG_H
+#ifndef SQUID_SNMP_DEBUG_H
+#define SQUID_SNMP_DEBUG_H
 
 #if STDC_HEADERS
 extern void snmplib_debug(int, char *,...);
@@ -11,4 +11,4 @@ extern void snmplib_debug(int, char *,...);
 extern void snmplib_debug(va_alist);
 #endif
 
-#endif
+#endif /* SQUID_SNMP_DEBUG_H */
diff --git a/include/snmp_error.h b/include/snmp_error.h
index 5812958ec6..6045a9d030 100644
--- a/include/snmp_error.h
+++ b/include/snmp_error.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
-#ifndef _SNMP_ERROR_H_
-#define _SNMP_ERROR_H_
+#ifndef SQUID_SNMP_ERROR_H
+#define SQUID_SNMP_ERROR_H
 
 /**********************************************************************
  *
@@ -24,7 +24,7 @@
  * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  * 
- * $Id: snmp_error.h,v 1.2 1998/04/04 01:43:46 kostas Exp $
+ * $Id: snmp_error.h,v 1.3 2001/10/08 16:18:31 hno Exp $
  * 
  **********************************************************************/
 
@@ -63,6 +63,6 @@ extern "C" {
 
 #ifdef __cplusplus
 }
-
 #endif
-#endif				/* _SNMP_ERROR_H_ */
+
+#endif				/* SQUID_SNMP_ERROR_H */
diff --git a/include/snmp_impl.h b/include/snmp_impl.h
index d3cb8c0066..c1dfcb8399 100644
--- a/include/snmp_impl.h
+++ b/include/snmp_impl.h
@@ -1,9 +1,9 @@
 /*
- * $Id: snmp_impl.h,v 1.11 1998/09/23 17:20:03 wessels Exp $
+ * $Id: snmp_impl.h,v 1.12 2001/10/08 16:18:31 hno Exp $
  */
 
-#ifndef _SNMP_IMPL_H_
-#define _SNMP_IMPL_H_
+#ifndef SQUID_SNMP_IMPL_H
+#define SQUID_SNMP_IMPL_H
 
 /*
  * Definitions for SNMP (RFC 1067) implementation.
@@ -97,4 +97,4 @@ struct trapVar {
 /* from snmp.c */
 extern u_char sid[];		/* size SID_MAX_LEN */
 
-#endif /* _SNMP_IMPL_H_ */
+#endif /* SQUID_SNMP_IMPL_H */
diff --git a/include/snmp_msg.h b/include/snmp_msg.h
index 06525b1338..7c6f44b6e6 100644
--- a/include/snmp_msg.h
+++ b/include/snmp_msg.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
-#ifndef _SNMP_MSG_H_
-#define _SNMP_MSG_H_
+#ifndef SQUID_SNMP_MSG_H
+#define SQUID_SNMP_MSG_H
 
 /**********************************************************************
  *
@@ -26,7 +26,7 @@
  * 
  * Author: Ryan Troll <ryan+@andrew.cmu.edu>
  * 
- * $Id: snmp_msg.h,v 1.2 1998/04/04 01:43:48 kostas Exp $
+ * $Id: snmp_msg.h,v 1.3 2001/10/08 16:18:31 hno Exp $
  * 
  **********************************************************************/
 
@@ -46,4 +46,5 @@ extern "C" {
 }
 
 #endif
-#endif				/* _SNMP_MSG_H_ */
+
+#endif	/* SQUID_SNMP_MSG_H */
diff --git a/include/snmp_pdu.h b/include/snmp_pdu.h
index 16b0b11a2c..1167e40e6d 100644
--- a/include/snmp_pdu.h
+++ b/include/snmp_pdu.h
@@ -1,5 +1,5 @@
-#ifndef _SNMP_PDU_H_
-#define _SNMP_PDU_H_
+#ifndef SQUID_SNMP_PDU_H
+#define SQUID_SNMP_PDU_H
 
 /**********************************************************************
  *
@@ -25,7 +25,7 @@
  * 
  * Author: Ryan Troll <ryan+@andrew.cmu.edu>
  * 
- * $Id: snmp_pdu.h,v 1.4 2001/01/07 10:57:14 hno Exp $
+ * $Id: snmp_pdu.h,v 1.5 2001/10/08 16:18:31 hno Exp $
  * 
  **********************************************************************/
 
@@ -103,4 +103,5 @@ void snmp_add_null_var(struct snmp_pdu *, oid *, int);
 #define SNMP_TRAP_AUTHENTICATIONFAILURE (0x4)
 #define SNMP_TRAP_EGPNEIGHBORLOSS       (0x5)
 #define SNMP_TRAP_ENTERPRISESPECIFIC    (0x6)
-#endif /* _SNMP_PDU_H_ */
+
+#endif /* SQUID_SNMP_PDU_H */
diff --git a/include/snmp_session.h b/include/snmp_session.h
index 5c2d891d2e..751a5c372d 100644
--- a/include/snmp_session.h
+++ b/include/snmp_session.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
-#ifndef _SNMP_SESSION_H_
-#define _SNMP_SESSION_H_
+#ifndef SQUID_SNMP_SESSION_H
+#define SQUID_SNMP_SESSION_H
 
 /**********************************************************************
  *
@@ -24,7 +24,7 @@
  * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  * 
- * $Id: snmp_session.h,v 1.2 1998/04/04 01:43:50 kostas Exp $
+ * $Id: snmp_session.h,v 1.3 2001/10/08 16:18:31 hno Exp $
  * 
  **********************************************************************/
 
@@ -51,4 +51,4 @@ struct snmp_session {
 #define RECEIVED_MESSAGE   1
 #define TIMED_OUT	   2
 
-#endif /* _SNMP_SESSION_H_ */
+#endif /* SQUID_SNMP_SESSION_H */
diff --git a/include/snmp_util.h b/include/snmp_util.h
index ba26dc9c41..5b2b3fd93e 100644
--- a/include/snmp_util.h
+++ b/include/snmp_util.h
@@ -1,9 +1,9 @@
 /*
- * $Id: snmp_util.h,v 1.7 2001/01/07 10:57:14 hno Exp $
+ * $Id: snmp_util.h,v 1.8 2001/10/08 16:18:31 hno Exp $
  */
 
-#ifndef SNMP_UTIL_H
-#define SNMP_UTIL_H
+#ifndef SQUID_SNMP_UTIL_H
+#define SQUID_SNMP_UTIL_H
 
 /* call a function at regular intervals (in seconds): */
 extern void snmp_alarm(int ival, void (*handler) (void));
@@ -46,4 +46,4 @@ int Util_file_read(char *file, int offset, char *data, int dataSz);
 int Util_file_write(char *file, int offset, char *data, int dataSz);
 
 /* ---------------------------------------------------------------------- */
-#endif
+#endif /* SQUID_SNMP_UTIL_H */
diff --git a/include/snmp_vars.h b/include/snmp_vars.h
index 3532ae250d..fed333b6e8 100644
--- a/include/snmp_vars.h
+++ b/include/snmp_vars.h
@@ -1,5 +1,5 @@
-#ifndef _SNMP_VARS_H_
-#define _SNMP_VARS_H_
+#ifndef SQUID_SNMP_VARS_H
+#define SQUID_SNMP_VARS_H
 
 /**********************************************************************
  *
@@ -25,7 +25,7 @@
  * 
  * Author: Ryan Troll <ryan+@andrew.cmu.edu>
  * 
- * $Id: snmp_vars.h,v 1.10 2001/01/07 10:57:14 hno Exp $
+ * $Id: snmp_vars.h,v 1.11 2001/10/08 16:18:31 hno Exp $
  * 
  **********************************************************************/
 
@@ -73,4 +73,4 @@ u_char *snmp_var_DecodeVarBind(u_char *, int *, struct variable_list **, int);
 typedef struct variable variable;
 typedef struct variable_list variable_list;
 
-#endif /* _SNMP_VARS_H_ */
+#endif /* SQUID_SNMP_VARS_H */
diff --git a/include/snprintf.h b/include/snprintf.h
index 6ea0425821..c4c5c9216a 100644
--- a/include/snprintf.h
+++ b/include/snprintf.h
@@ -1,7 +1,10 @@
 /*
- * $Id: snprintf.h,v 1.5 2001/01/10 20:16:36 hno Exp $
+ * $Id: snprintf.h,v 1.6 2001/10/08 16:18:31 hno Exp $
  */
 
+#ifndef SQUID_SNPRINTF_H
+#define SQUID_SNPRINTF_H
+
 /* if you have configure you can use this */
 #if defined(HAVE_CONFIG_H)
 #include "config.h"
@@ -47,3 +50,5 @@ int vsnprintf(char *str, size_t count, const char *fmt, va_list arg);
 int vsnprintf();
 #endif
 #endif
+
+#endif /* SQUID_SNPRINTF_H */
diff --git a/include/splay.h b/include/splay.h
index ad99b5bf08..cb87ffc735 100644
--- a/include/splay.h
+++ b/include/splay.h
@@ -1,9 +1,9 @@
 /*
- * $Id: splay.h,v 1.9 2001/01/07 14:44:32 hno Exp $
+ * $Id: splay.h,v 1.10 2001/10/08 16:18:31 hno Exp $
  */
 
-#ifndef _SPLAY_H
-#define _SPLAY_H
+#ifndef SQUID_SPLAY_H
+#define SQUID_SPLAY_H
 
 typedef struct _splay_node {
     void *data;
@@ -22,4 +22,4 @@ extern splayNode *splay_splay(const void *, splayNode *, SPLAYCMP *);
 extern void splay_destroy(splayNode *, SPLAYFREE *);
 extern void splay_walk(splayNode *, SPLAYWALKEE *, void *);
 
-#endif /* _SPLAY_H */
+#endif /* SQUID_SPLAY_H */
diff --git a/include/squid_types.h b/include/squid_types.h
index abb23df61d..92389de4a7 100644
--- a/include/squid_types.h
+++ b/include/squid_types.h
@@ -1,5 +1,5 @@
 /*
- * $Id: squid_types.h,v 1.1 2001/02/25 21:49:09 hno Exp $
+ * $Id: squid_types.h,v 1.2 2001/10/08 16:18:31 hno Exp $
  *
  * * * * * * * * Legal stuff * * * * * * *
  *
@@ -50,8 +50,8 @@
  * header to include which takes care of proper preprocessor stuff
  */
 
-#ifndef _SQUID_TYPES_H_
-#define _SQUID_TYPES_H_
+#ifndef SQUID_TYPES_H
+#define SQUID_TYPES_H
 
 #include "autoconf.h"
 
@@ -72,4 +72,4 @@
 #endif
 #endif /* HAVE_GLIB_H */
 
-#endif /* _SQUID_TYPES_H_ */
+#endif /* SQUID_TYPES_H */
diff --git a/include/tempnam.h b/include/tempnam.h
index 55f5b5c03c..92516d825d 100644
--- a/include/tempnam.h
+++ b/include/tempnam.h
@@ -1,5 +1,5 @@
 /*
- * $Id: tempnam.h,v 1.10 1998/09/23 17:20:06 wessels Exp $
+ * $Id: tempnam.h,v 1.11 2001/10/08 16:18:31 hno Exp $
  */
 
 
@@ -20,7 +20,7 @@
  * not, write to the Free Software Foundation, Inc., 675 Mass Ave,
  * Cambridge, MA 02139, USA.  */
 
-#ifndef _TEMPNAM_H
-#define _TEMPNAM_H
+#ifndef SQUID_TEMPNAM_H
+#define SQUID_TEMPNAM_H
 extern char *tempnam(const char *, const char *);
-#endif /* _TEMPNAM_H */
+#endif /* SQUID_TEMPNAM_H */
diff --git a/include/util.h b/include/util.h
index 65fd301308..ac5577d364 100644
--- a/include/util.h
+++ b/include/util.h
@@ -1,5 +1,5 @@
 /*
- * $Id: util.h,v 1.60 2001/06/29 14:48:07 hno Exp $
+ * $Id: util.h,v 1.61 2001/10/08 16:18:31 hno Exp $
  *
  * AUTHOR: Harvest Derived
  *
@@ -31,8 +31,8 @@
  *  
  */
 
-#ifndef _UTIL_H_
-#define _UTIL_H_
+#ifndef SQUID_UTIL_H
+#define SQUID_UTIL_H
 
 #include "config.h"
 #include <stdio.h>
@@ -132,4 +132,4 @@ double drand48(void);
  */
 int statMemoryAccounted(void);
 
-#endif /* ndef _UTIL_H_ */
+#endif /* SQUID_UTIL_H */
diff --git a/src/defines.h b/src/defines.h
index 1f710d0e2c..e4fe553d4f 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: defines.h,v 1.94 2001/08/16 00:16:16 hno Exp $
+ * $Id: defines.h,v 1.95 2001/10/08 16:18:32 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -31,6 +31,9 @@
  *
  */
 
+#ifndef SQUID_STRUCTS_H
+#define SQUID_STRUCTS_H
+
 #ifndef TRUE
 #define TRUE 1
 #endif
@@ -303,3 +306,5 @@
 #define _WIN_OS_WIN2K	5
 #define _WIN_OS_WINXP	6
 #endif
+
+#endif /* SQUID_STRUCTS_H */
diff --git a/src/enums.h b/src/enums.h
index 02a51e5c79..474cce6ea5 100644
--- a/src/enums.h
+++ b/src/enums.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: enums.h,v 1.195 2001/09/07 18:02:44 adrian Exp $
+ * $Id: enums.h,v 1.196 2001/10/08 16:18:32 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -31,6 +31,9 @@
  *
  */
 
+#ifndef SQUID_ENUMS_H
+#define SQUID_ENUMS_H
+
 typedef enum {
     LOG_TAG_NONE,
     LOG_TCP_HIT,
@@ -723,3 +726,5 @@ enum {
     VARY_OTHER,
     VARY_CANCEL
 };
+
+#endif /* SQUID_ENUMS_H */
diff --git a/src/globals.h b/src/globals.h
index c2bdcf35d1..5600fdbb8f 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: globals.h,v 1.106 2001/08/31 11:19:12 robertc Exp $
+ * $Id: globals.h,v 1.107 2001/10/08 16:18:32 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -31,6 +31,9 @@
  *
  */
 
+#ifndef SQUID_GLOBALS_H
+#define SQUID_GLOBALS_H
+
 extern FILE *debug_log;		/* NULL */
 extern SquidConfig Config;
 extern SquidConfig2 Config2;
@@ -158,3 +161,5 @@ extern int incoming_sockets_accepted;
 extern unsigned int WIN32_OS_version;	/* 0 */
 extern char *WIN32_OS_string;
 #endif
+
+#endif /* SQUID_GLOBALS_H */
diff --git a/src/protos.h b/src/protos.h
index bd37f9da7a..363887296c 100644
--- a/src/protos.h
+++ b/src/protos.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: protos.h,v 1.412 2001/09/09 19:57:10 hno Exp $
+ * $Id: protos.h,v 1.413 2001/10/08 16:18:32 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -31,6 +31,9 @@
  *
  */
 
+#ifndef SQUID_PROTOS_H
+#define SQUID_PROTOS_H
+
 extern void accessLogLog(AccessLogEntry *);
 extern void accessLogRotate(void);
 extern void accessLogClose(void);
@@ -1315,3 +1318,5 @@ int varyEvaluateMatch(StoreEntry * entry, request_t * req);
 extern int WIN32_Subsystem_Init(void);
 extern void WIN32_Exit(void);
 #endif
+
+#endif /* SQUID_PROTOS_H */
diff --git a/src/ssl_support.h b/src/ssl_support.h
index a6949d12c4..cb9ac22ed1 100644
--- a/src/ssl_support.h
+++ b/src/ssl_support.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ssl_support.h,v 1.2 2001/05/04 13:37:42 hno Exp $
+ * $Id: ssl_support.h,v 1.3 2001/10/08 16:18:33 hno Exp $
  *
  * AUTHOR: Benno Rice
  *
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef SSL_SUPPORT_H
-#define SSL_SUPPORT_H
+#ifndef SQUID_SSL_SUPPORT_H
+#define SQUID_SSL_SUPPORT_H
 
 #include "config.h"
 #if HAVE_OPENSSL_SSL_H
@@ -47,4 +47,4 @@ SSL_CTX *sslLoadCert(const char *certfile, const char *keyfile);
 int ssl_read_method(int, char *, int);
 int ssl_write_method(int, const char *, int);
 
-#endif /* SSL_SUPPORT_H */
+#endif /* SQUID_SSL_SUPPORT_H */
diff --git a/src/structs.h b/src/structs.h
index e6bb1b7568..5a3c92f74e 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.401 2001/10/08 15:05:11 hno Exp $
+ * $Id: structs.h,v 1.402 2001/10/08 16:18:33 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -31,6 +31,9 @@
  *
  */
 
+#ifndef SQUID_STRUCTS_H
+#define SQUID_STRUCTS_H
+
 #include "config.h"
 #include "splay.h"
 
@@ -2137,3 +2140,5 @@ struct cache_dir_option {
     void (*parse) (SwapDir * sd, const char *option, const char *value, int reconfiguring);
     void (*dump) (StoreEntry * e, const char *option, SwapDir * sd);
 };
+
+#endif /* SQUID_STRUCTS_H */
diff --git a/src/typedefs.h b/src/typedefs.h
index 433051c57e..209429b655 100644
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: typedefs.h,v 1.130 2001/08/03 15:13:04 adrian Exp $
+ * $Id: typedefs.h,v 1.131 2001/10/08 16:18:33 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -31,8 +31,8 @@
  *
  */
 
-#ifndef _TYPEDEFS_H_
-#define _TYPEDEFS_H_
+#ifndef SQUID_TYPEDEFS_H
+#define SQUID_TYPEDEFS_H
 
 typedef unsigned int store_status_t;
 typedef unsigned int mem_status_t;
@@ -358,4 +358,4 @@ typedef RemovalPolicy *REMOVALPOLICYCREATE(wordlist * args);
 
 typedef int STDIRSELECT(const StoreEntry *);
 
-#endif /* _TYPEDEFS_H_ */
+#endif /* SQUID_TYPEDEFS_H */