[ntpsec commit] Move all ISC idempotenct guards into the GUARD_ namespace.

Eric S. Raymond esr at ntpsec.org
Mon Sep 28 23:48:46 UTC 2015


Module:    ntpsec
Branch:    master
Commit:    1dd9437bb1d620d54e2f8879dad3aec4843542f1
Changeset: http://git.ntpsec.org/ntpsec/commit/?id=1dd9437bb1d620d54e2f8879dad3aec4843542f1

Author:    Eric S. Raymond <esr at thyrsus.com>
Date:      Mon Sep 28 19:47:40 2015 -0400

Move all ISC idempotenct guards into the GUARD_ namespace.

---

 lib/isc/include/isc/assertions.h          |  9 +++------
 lib/isc/include/isc/backtrace.h           |  6 +++---
 lib/isc/include/isc/error.h               |  8 +++-----
 lib/isc/include/isc/formatcheck.h         |  8 +++-----
 lib/isc/include/isc/interfaceiter.h       |  8 +++-----
 lib/isc/include/isc/lang.h                |  8 +++-----
 lib/isc/include/isc/lib.h                 |  8 +++-----
 lib/isc/include/isc/list.h                |  8 +++-----
 lib/isc/include/isc/log.h                 |  8 +++-----
 lib/isc/include/isc/magic.h               |  8 +++-----
 lib/isc/include/isc/md5.h                 |  6 +++---
 lib/isc/include/isc/msgcat.h              |  8 +++-----
 lib/isc/include/isc/msgs.h                |  8 +++-----
 lib/isc/include/isc/netaddr.h             |  8 +++-----
 lib/isc/include/isc/os.h                  |  8 +++-----
 lib/isc/include/isc/platform.h            |  8 +++-----
 lib/isc/include/isc/random.h              |  8 +++-----
 lib/isc/include/isc/result.h              |  8 +++-----
 lib/isc/include/isc/resultclass.h         |  8 +++-----
 lib/isc/include/isc/sha1.h                | 10 +++-------
 lib/isc/include/isc/sockaddr.h            |  8 +++-----
 lib/isc/include/isc/types.h               |  8 +++-----
 lib/isc/include/isc/util.h                |  8 +++-----
 lib/isc/pthreads/include/isc/condition.h  |  8 +++-----
 lib/isc/pthreads/include/isc/mutex.h      |  8 +++-----
 lib/isc/pthreads/include/isc/once.h       |  8 +++-----
 lib/isc/pthreads/include/isc/thread.h     |  8 +++-----
 lib/isc/unix/ifiter_ioctl.c               |  2 --
 lib/isc/unix/include/isc/int.h            |  8 +++-----
 lib/isc/unix/include/isc/netdb.h          |  8 +++-----
 lib/isc/unix/include/isc/syslog.h         |  8 +++-----
 lib/isc/unix/include/isc/time.h           |  8 +++-----
 lib/isc/win32/include/isc/bind_registry.h |  8 +++-----
 lib/isc/win32/include/isc/bindevt.h       |  8 +++-----
 lib/isc/win32/include/isc/condition.h     |  8 +++-----
 lib/isc/win32/include/isc/int.h           |  8 +++-----
 lib/isc/win32/include/isc/ipv6.h          |  8 +++-----
 lib/isc/win32/include/isc/mutex.h         |  8 +++-----
 lib/isc/win32/include/isc/net.h           |  8 +++-----
 lib/isc/win32/include/isc/netdb.h         |  8 +++-----
 lib/isc/win32/include/isc/ntgroups.h      |  8 +++-----
 lib/isc/win32/include/isc/ntpaths.h       |  8 +++-----
 lib/isc/win32/include/isc/offset.h        |  8 +++-----
 lib/isc/win32/include/isc/once.h          |  8 +++-----
 lib/isc/win32/include/isc/platform.h      |  8 +++-----
 lib/isc/win32/include/isc/syslog.h        |  8 +++-----
 lib/isc/win32/include/isc/thread.h        |  8 +++-----
 lib/isc/win32/include/isc/time.h          |  8 +++-----
 lib/isc/win32/include/isc/win32os.h       |  8 +++-----
 lib/isc/win32/syslog.h                    |  6 ++----
 50 files changed, 146 insertions(+), 245 deletions(-)

diff --git a/lib/isc/include/isc/assertions.h b/lib/isc/include/isc/assertions.h
index 2c81b1a..94a733d 100644
--- a/lib/isc/include/isc/assertions.h
+++ b/lib/isc/include/isc/assertions.h
@@ -15,14 +15,11 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/*
- * $Id: assertions.h,v 1.28 2009/09/29 23:48:04 tbox Exp $
- */
 /*! \file isc/assertions.h
  */
 
-#ifndef ISC_ASSERTIONS_H
-#define ISC_ASSERTIONS_H 1
+#ifndef GUARD_ISC_ASSERTIONS_H
+#define GUARD_ISC_ASSERTIONS_H 1
 
 #include <isc/lang.h>
 #include <isc/platform.h>
@@ -123,4 +120,4 @@ isc_assertion_typetotext(isc_assertiontype_t type);
 
 ISC_LANG_ENDDECLS
 
-#endif /* ISC_ASSERTIONS_H */
+#endif /* GUARD_ISC_ASSERTIONS_H */
diff --git a/lib/isc/include/isc/backtrace.h b/lib/isc/include/isc/backtrace.h
index 7d7fc32..268952f 100644
--- a/lib/isc/include/isc/backtrace.h
+++ b/lib/isc/include/isc/backtrace.h
@@ -37,8 +37,8 @@
  * non-error-handling context and validates arguments with assertion checks.
  */
 
-#ifndef ISC_BACKTRACE_H
-#define ISC_BACKTRACE_H 1
+#ifndef GUARD_ISC_BACKTRACE_H
+#define GUARD_ISC_BACKTRACE_H 1
 
 /***
  ***	Imports
@@ -128,4 +128,4 @@ isc_backtrace_getsymbol(const void *addr, const char **symbolp,
  */
 ISC_LANG_ENDDECLS
 
-#endif	/* ISC_BACKTRACE_H */
+#endif	/* GUARD_ISC_BACKTRACE_H */
diff --git a/lib/isc/include/isc/error.h b/lib/isc/include/isc/error.h
index e0cdfa8..c8e0dca 100644
--- a/lib/isc/include/isc/error.h
+++ b/lib/isc/include/isc/error.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: error.h,v 1.22 2009/09/29 23:48:04 tbox Exp $ */
-
-#ifndef ISC_ERROR_H
-#define ISC_ERROR_H 1
+#ifndef GUARD_ISC_ERROR_H
+#define GUARD_ISC_ERROR_H 1
 
 /*! \file isc/error.h */
 
@@ -60,4 +58,4 @@ isc_error_runtimecheck(const char *, int, const char *);
 
 ISC_LANG_ENDDECLS
 
-#endif /* ISC_ERROR_H */
+#endif /* GUARD_ISC_ERROR_H */
diff --git a/lib/isc/include/isc/formatcheck.h b/lib/isc/include/isc/formatcheck.h
index 51ce3ca..ae30609 100644
--- a/lib/isc/include/isc/formatcheck.h
+++ b/lib/isc/include/isc/formatcheck.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: formatcheck.h,v 1.13 2007/06/19 23:47:18 tbox Exp $ */
-
-#ifndef ISC_FORMATCHECK_H
-#define ISC_FORMATCHECK_H 1
+#ifndef GUARD_ISC_FORMATCHECK_H
+#define GUARD_ISC_FORMATCHECK_H 1
 
 /*! \file isc/formatcheck.h */
 
@@ -37,4 +35,4 @@
 #define ISC_FORMAT_PRINTF(fmt, args)
 #endif
 
-#endif /* ISC_FORMATCHECK_H */
+#endif /* GUARD_ISC_FORMATCHECK_H */
diff --git a/lib/isc/include/isc/interfaceiter.h b/lib/isc/include/isc/interfaceiter.h
index 544f54b..d26eac2 100644
--- a/lib/isc/include/isc/interfaceiter.h
+++ b/lib/isc/include/isc/interfaceiter.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: interfaceiter.h,v 1.17 2007/06/19 23:47:18 tbox Exp $ */
-
-#ifndef ISC_INTERFACEITER_H
-#define ISC_INTERFACEITER_H 1
+#ifndef GUARD_ISC_INTERFACEITER_H
+#define GUARD_ISC_INTERFACEITER_H 1
 
 /*****
  ***** Module Info
@@ -135,4 +133,4 @@ isc_interfaceiter_destroy(isc_interfaceiter_t **iterp);
 
 ISC_LANG_ENDDECLS
 
-#endif /* ISC_INTERFACEITER_H */
+#endif /* GUARD_ISC_INTERFACEITER_H */
diff --git a/lib/isc/include/isc/lang.h b/lib/isc/include/isc/lang.h
index 8c60866..bf5f114 100644
--- a/lib/isc/include/isc/lang.h
+++ b/lib/isc/include/isc/lang.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lang.h,v 1.13 2007/06/19 23:47:18 tbox Exp $ */
-
-#ifndef ISC_LANG_H
-#define ISC_LANG_H 1
+#ifndef GUARD_ISC_LANG_H
+#define GUARD_ISC_LANG_H 1
 
 /*! \file isc/lang.h */
 
@@ -30,4 +28,4 @@
 #define ISC_LANG_ENDDECLS
 #endif
 
-#endif /* ISC_LANG_H */
+#endif /* GUARD_ISC_LANG_H */
diff --git a/lib/isc/include/isc/lib.h b/lib/isc/include/isc/lib.h
index f24fef8..131e7fb 100644
--- a/lib/isc/include/isc/lib.h
+++ b/lib/isc/include/isc/lib.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lib.h,v 1.16 2009/09/02 23:48:03 tbox Exp $ */
-
-#ifndef ISC_LIB_H
-#define ISC_LIB_H 1
+#ifndef GUARD_ISC_LIB_H
+#define GUARD_ISC_LIB_H 1
 
 /*! \file isc/lib.h */
 
@@ -47,4 +45,4 @@ isc_lib_register(void);
 
 ISC_LANG_ENDDECLS
 
-#endif /* ISC_LIB_H */
+#endif /* GUARD_ISC_LIB_H */
diff --git a/lib/isc/include/isc/list.h b/lib/isc/include/isc/list.h
index e911ab9..088c9e2 100644
--- a/lib/isc/include/isc/list.h
+++ b/lib/isc/include/isc/list.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id$ */
-
-#ifndef ISC_LIST_H
-#define ISC_LIST_H 1
+#ifndef GUARD_ISC_LIST_H
+#define GUARD_ISC_LIST_H 1
 #include <stdbool.h>
 #include <isc/assertions.h>
 
@@ -194,4 +192,4 @@
 #define __ISC_LIST_DEQUEUEUNSAFE_TYPE(list, elt, link, type) \
 	__ISC_LIST_UNLINKUNSAFE_TYPE(list, elt, link, type)
 
-#endif /* ISC_LIST_H */
+#endif /* GUARD_ISC_LIST_H */
diff --git a/lib/isc/include/isc/log.h b/lib/isc/include/isc/log.h
index 4661945..11fcd96 100644
--- a/lib/isc/include/isc/log.h
+++ b/lib/isc/include/isc/log.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.h,v 1.59 2009/02/16 02:01:16 marka Exp $ */
-
-#ifndef ISC_LOG_H
-#define ISC_LOG_H 1
+#ifndef GUARD_ISC_LOG_H
+#define GUARD_ISC_LOG_H 1
 
 /*! \file isc/log.h */
 
@@ -912,4 +910,4 @@ isc_log_setcontext(isc_log_t *lctx);
 
 ISC_LANG_ENDDECLS
 
-#endif /* ISC_LOG_H */
+#endif /* GUARD_ISC_LOG_H */
diff --git a/lib/isc/include/isc/magic.h b/lib/isc/include/isc/magic.h
index 073de90..ce49c21 100644
--- a/lib/isc/include/isc/magic.h
+++ b/lib/isc/include/isc/magic.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: magic.h,v 1.18 2007/06/19 23:47:18 tbox Exp $ */
-
-#ifndef ISC_MAGIC_H
-#define ISC_MAGIC_H 1
+#ifndef GUARD_ISC_MAGIC_H
+#define GUARD_ISC_MAGIC_H 1
 
 /*! \file isc/magic.h */
 
@@ -38,4 +36,4 @@ typedef struct {
 
 #define ISC_MAGIC(a, b, c, d)	((a) << 24 | (b) << 16 | (c) << 8 | (d))
 
-#endif /* ISC_MAGIC_H */
+#endif /* GUARD_ISC_MAGIC_H */
diff --git a/lib/isc/include/isc/md5.h b/lib/isc/include/isc/md5.h
index dfa586d..387c5ee 100644
--- a/lib/isc/include/isc/md5.h
+++ b/lib/isc/include/isc/md5.h
@@ -40,8 +40,8 @@
  * Still in the public domain.
  */
 
-#ifndef ISC_MD5_H
-#define ISC_MD5_H 1
+#ifndef GUARD_ISC_MD5_H
+#define GUARD_ISC_MD5_H 1
 
 #include <isc/lang.h>
 #include <isc/platform.h>
@@ -80,4 +80,4 @@ isc_md5_final(isc_md5_t *ctx, unsigned char *digest);
 
 ISC_LANG_ENDDECLS
 
-#endif /* ISC_MD5_H */
+#endif /* GUARD_ISC_MD5_H */
diff --git a/lib/isc/include/isc/msgcat.h b/lib/isc/include/isc/msgcat.h
index fe3d336..34c214d 100644
--- a/lib/isc/include/isc/msgcat.h
+++ b/lib/isc/include/isc/msgcat.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: msgcat.h,v 1.13 2007/06/19 23:47:18 tbox Exp $ */
-
-#ifndef ISC_MSGCAT_H
-#define ISC_MSGCAT_H 1
+#ifndef GUARD_ISC_MSGCAT_H
+#define GUARD_ISC_MSGCAT_H 1
 
 /*****
  ***** Module Info
@@ -128,4 +126,4 @@ isc_msgcat_get(isc_msgcat_t *msgcat, int set, int message,
 
 ISC_LANG_ENDDECLS
 
-#endif /* ISC_MSGCAT_H */
+#endif /* GUARD_ISC_MSGCAT_H */
diff --git a/lib/isc/include/isc/msgs.h b/lib/isc/include/isc/msgs.h
index 60c5c7c..3410556 100644
--- a/lib/isc/include/isc/msgs.h
+++ b/lib/isc/include/isc/msgs.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: msgs.h,v 1.19 2009/10/01 23:48:08 tbox Exp $ */
-
-#ifndef ISC_MSGS_H
-#define ISC_MSGS_H 1
+#ifndef GUARD_ISC_MSGS_H
+#define GUARD_ISC_MSGS_H 1
 
 /*! \file isc/msgs.h */
 
@@ -192,4 +190,4 @@
 
 /*@}*/
 
-#endif /* ISC_MSGS_H */
+#endif /* GUARD_ISC_MSGS_H */
diff --git a/lib/isc/include/isc/netaddr.h b/lib/isc/include/isc/netaddr.h
index 86d8fb9..54284c5 100644
--- a/lib/isc/include/isc/netaddr.h
+++ b/lib/isc/include/isc/netaddr.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: netaddr.h,v 1.37 2009/01/17 23:47:43 tbox Exp $ */
-
-#ifndef ISC_NETADDR_H
-#define ISC_NETADDR_H 1
+#ifndef GUARD_ISC_NETADDR_H
+#define GUARD_ISC_NETADDR_H 1
 
 /*! \file isc/netaddr.h */
 
@@ -178,4 +176,4 @@ isc_netaddr_prefixok(const isc_netaddr_t *na, unsigned int prefixlen);
 
 ISC_LANG_ENDDECLS
 
-#endif /* ISC_NETADDR_H */
+#endif /* GUARD_ISC_NETADDR_H */
diff --git a/lib/isc/include/isc/os.h b/lib/isc/include/isc/os.h
index 3cf59e2..c5e3e25 100644
--- a/lib/isc/include/isc/os.h
+++ b/lib/isc/include/isc/os.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.h,v 1.12 2007/06/19 23:47:18 tbox Exp $ */
-
-#ifndef ISC_OS_H
-#define ISC_OS_H 1
+#ifndef GUARD_ISC_OS_H
+#define GUARD_ISC_OS_H 1
 
 /*! \file isc/os.h */
 
@@ -35,4 +33,4 @@ isc_os_ncpus(void);
 
 ISC_LANG_ENDDECLS
 
-#endif /* ISC_OS_H */
+#endif /* GUARD_ISC_OS_H */
diff --git a/lib/isc/include/isc/platform.h b/lib/isc/include/isc/platform.h
index bd11a25..e9e0ed2 100644
--- a/lib/isc/include/isc/platform.h
+++ b/lib/isc/include/isc/platform.h
@@ -15,10 +15,8 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: platform.h.in,v 1.28 2001/11/19 03:08:26 mayer Exp $ */
-
-#ifndef ISC_PLATFORM_H
-#define ISC_PLATFORM_H 1
+#ifndef GUARD_ISC_PLATFORM_H
+#define GUARD_ISC_PLATFORM_H 1
 
 
 #ifndef ISC_PLATFORM_USEDECLSPEC
@@ -37,4 +35,4 @@
  * End:
  */
 
-#endif /* ISC_PLATFORM_H */
+#endif /* GUARD_ISC_PLATFORM_H */
diff --git a/lib/isc/include/isc/random.h b/lib/isc/include/isc/random.h
index 1f9572d..0978cd9 100644
--- a/lib/isc/include/isc/random.h
+++ b/lib/isc/include/isc/random.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: random.h,v 1.20 2009/01/17 23:47:43 tbox Exp $ */
-
-#ifndef ISC_RANDOM_H
-#define ISC_RANDOM_H 1
+#ifndef GUARD_ISC_RANDOM_H
+#define GUARD_ISC_RANDOM_H 1
 
 #include <isc/lang.h>
 #include <isc/types.h>
@@ -59,4 +57,4 @@ isc_random_jitter(isc_uint32_t max, isc_uint32_t jitter);
 
 ISC_LANG_ENDDECLS
 
-#endif /* ISC_RANDOM_H */
+#endif /* GUARD_ISC_RANDOM_H */
diff --git a/lib/isc/include/isc/result.h b/lib/isc/include/isc/result.h
index dcd457b..f2d70f1 100644
--- a/lib/isc/include/isc/result.h
+++ b/lib/isc/include/isc/result.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id$ */
-
-#ifndef ISC_RESULT_H
-#define ISC_RESULT_H 1
+#ifndef GUARD_ISC_RESULT_H
+#define GUARD_ISC_RESULT_H 1
 
 /*! \file isc/result.h */
 
@@ -106,4 +104,4 @@ isc_result_register(unsigned int base, unsigned int nresults,
 
 ISC_LANG_ENDDECLS
 
-#endif /* ISC_RESULT_H */
+#endif /* GUARD_ISC_RESULT_H */
diff --git a/lib/isc/include/isc/resultclass.h b/lib/isc/include/isc/resultclass.h
index d91e800..87fc72c 100644
--- a/lib/isc/include/isc/resultclass.h
+++ b/lib/isc/include/isc/resultclass.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resultclass.h,v 1.20 2009/09/02 23:48:03 tbox Exp $ */
-
-#ifndef ISC_RESULTCLASS_H
-#define ISC_RESULTCLASS_H 1
+#ifndef GUARD_ISC_RESULTCLASS_H
+#define GUARD_ISC_RESULTCLASS_H 1
 
 
 /*! \file isc/resultclass.h
@@ -48,4 +46,4 @@
 #define	ISC_RESULTCLASS_DHCP		ISC_RESULTCLASS_FROMNUM(6)
 
 
-#endif /* ISC_RESULTCLASS_H */
+#endif /* GUARD_ISC_RESULTCLASS_H */
diff --git a/lib/isc/include/isc/sha1.h b/lib/isc/include/isc/sha1.h
index 313ff96..0687173 100644
--- a/lib/isc/include/isc/sha1.h
+++ b/lib/isc/include/isc/sha1.h
@@ -15,12 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef ISC_SHA1_H
-#define ISC_SHA1_H 1
-
-/* $Id: sha1.h,v 1.19 2009/02/06 23:47:42 tbox Exp $ */
-
-/*	$NetBSD: sha1.h,v 1.2 1998/05/29 22:55:44 thorpej Exp $	*/
+#ifndef GUARD_ISC_SHA1_H
+#define GUARD_ISC_SHA1_H 1
 
 /*! \file isc/sha1.h
  * \brief SHA-1 in C
@@ -65,4 +61,4 @@ isc_sha1_final(isc_sha1_t *ctx, unsigned char *digest);
 
 ISC_LANG_ENDDECLS
 
-#endif /* ISC_SHA1_H */
+#endif /* GUARD_ISC_SHA1_H */
diff --git a/lib/isc/include/isc/sockaddr.h b/lib/isc/include/isc/sockaddr.h
index a76b06e..e1cf276 100644
--- a/lib/isc/include/isc/sockaddr.h
+++ b/lib/isc/include/isc/sockaddr.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sockaddr.h,v 1.57 2009/01/18 23:48:14 tbox Exp $ */
-
-#ifndef ISC_SOCKADDR_H
-#define ISC_SOCKADDR_H 1
+#ifndef GUARD_ISC_SOCKADDR_H
+#define GUARD_ISC_SOCKADDR_H 1
 
 /*! \file isc/sockaddr.h */
 
@@ -238,4 +236,4 @@ isc_sockaddr_frompath(isc_sockaddr_t *sockaddr, const char *path);
 
 ISC_LANG_ENDDECLS
 
-#endif /* ISC_SOCKADDR_H */
+#endif /* GUARD_ISC_SOCKADDR_H */
diff --git a/lib/isc/include/isc/types.h b/lib/isc/include/isc/types.h
index fa18f10..552b330 100644
--- a/lib/isc/include/isc/types.h
+++ b/lib/isc/include/isc/types.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id$ */
-
-#ifndef ISC_TYPES_H
-#define ISC_TYPES_H 1
+#ifndef GUARD_ISC_TYPES_H
+#define GUARD_ISC_TYPES_H 1
 
 #include <isc/namespace.h>
 
@@ -120,4 +118,4 @@ typedef enum {
 	isc_resource_stacksize
 } isc_resource_t;
 
-#endif /* ISC_TYPES_H */
+#endif /* GUARD_ISC_TYPES_H */
diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h
index c8d49f2..5129879 100644
--- a/lib/isc/include/isc/util.h
+++ b/lib/isc/include/isc/util.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id$ */
-
-#ifndef ISC_UTIL_H
-#define ISC_UTIL_H 1
+#ifndef GUARD_ISC_UTIL_H
+#define GUARD_ISC_UTIL_H 1
 
 /*! \file isc/util.h
  * NOTE:
@@ -238,4 +236,4 @@
  */
 #define TIME_NOW(tp) 	RUNTIME_CHECK(isc_time_now((tp)) == ISC_R_SUCCESS)
 
-#endif /* ISC_UTIL_H */
+#endif /* GUARD_ISC_UTIL_H */
diff --git a/lib/isc/pthreads/include/isc/condition.h b/lib/isc/pthreads/include/isc/condition.h
index 04a6118..4c8aa77 100644
--- a/lib/isc/pthreads/include/isc/condition.h
+++ b/lib/isc/pthreads/include/isc/condition.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: condition.h,v 1.26 2007/06/19 23:47:18 tbox Exp $ */
-
-#ifndef ISC_CONDITION_H
-#define ISC_CONDITION_H 1
+#ifndef GUARD_ISC_CONDITION_H
+#define GUARD_ISC_CONDITION_H 1
 
 /*! \file */
 
@@ -62,4 +60,4 @@ isc_condition_waituntil(isc_condition_t *, isc_mutex_t *, isc_time_t *);
 
 ISC_LANG_ENDDECLS
 
-#endif /* ISC_CONDITION_H */
+#endif /* GUARD_ISC_CONDITION_H */
diff --git a/lib/isc/pthreads/include/isc/mutex.h b/lib/isc/pthreads/include/isc/mutex.h
index dd7d326..aed1dca 100644
--- a/lib/isc/pthreads/include/isc/mutex.h
+++ b/lib/isc/pthreads/include/isc/mutex.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mutex.h,v 1.30 2007/06/19 23:47:18 tbox Exp $ */
-
-#ifndef ISC_MUTEX_H
-#define ISC_MUTEX_H 1
+#ifndef GUARD_ISC_MUTEX_H
+#define GUARD_ISC_MUTEX_H 1
 
 /*! \file */
 
@@ -142,4 +140,4 @@ isc_mutex_init_errcheck(isc_mutex_t *mp);
 #endif /* ISC_MUTEX_PROFILE */
 
 ISC_LANG_ENDDECLS
-#endif /* ISC_MUTEX_H */
+#endif /* GUARD_ISC_MUTEX_H */
diff --git a/lib/isc/pthreads/include/isc/once.h b/lib/isc/pthreads/include/isc/once.h
index 31d76fb..4e96363 100644
--- a/lib/isc/pthreads/include/isc/once.h
+++ b/lib/isc/pthreads/include/isc/once.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: once.h,v 1.13 2007/06/19 23:47:18 tbox Exp $ */
-
-#ifndef ISC_ONCE_H
-#define ISC_ONCE_H 1
+#ifndef GUARD_ISC_ONCE_H
+#define GUARD_ISC_ONCE_H 1
 
 /*! \file */
 
@@ -47,4 +45,4 @@ typedef pthread_once_t isc_once_t;
 	((pthread_once((op), (f)) == 0) ? \
 	 ISC_R_SUCCESS : ISC_R_UNEXPECTED)
 
-#endif /* ISC_ONCE_H */
+#endif /* GUARD_ISC_ONCE_H */
diff --git a/lib/isc/pthreads/include/isc/thread.h b/lib/isc/pthreads/include/isc/thread.h
index 0d7858f..35013ba 100644
--- a/lib/isc/pthreads/include/isc/thread.h
+++ b/lib/isc/pthreads/include/isc/thread.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: thread.h,v 1.26 2007/06/19 23:47:18 tbox Exp $ */
-
-#ifndef ISC_THREAD_H
-#define ISC_THREAD_H 1
+#ifndef GUARD_ISC_THREAD_H
+#define GUARD_ISC_THREAD_H 1
 
 /*! \file */
 
@@ -54,4 +52,4 @@ isc_thread_create(isc_threadfunc_t, isc_threadarg_t, isc_thread_t *);
 
 ISC_LANG_ENDDECLS
 
-#endif /* ISC_THREAD_H */
+#endif /* GUARD_ISC_THREAD_H */
diff --git a/lib/isc/unix/ifiter_ioctl.c b/lib/isc/unix/ifiter_ioctl.c
index 7cf73b4..abfb2e8 100644
--- a/lib/isc/unix/ifiter_ioctl.c
+++ b/lib/isc/unix/ifiter_ioctl.c
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ifiter_ioctl.c,v 1.62 2009/01/18 23:48:14 tbox Exp $ */
-
 /*! \file
  * \brief
  * Obtain the list of network interfaces using the SIOCGLIFCONF ioctl.
diff --git a/lib/isc/unix/include/isc/int.h b/lib/isc/unix/include/isc/int.h
index 73feb3b..c6445ed 100644
--- a/lib/isc/unix/include/isc/int.h
+++ b/lib/isc/unix/include/isc/int.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: int.h,v 1.16 2007/06/19 23:47:19 tbox Exp $ */
-
-#ifndef ISC_INT_H
-#define ISC_INT_H 1
+#ifndef GUARD_ISC_INT_H
+#define GUARD_ISC_INT_H 1
 
 /*! \file */
 
@@ -52,4 +50,4 @@ typedef unsigned long long		isc_uint64_t;
 #define ISC_INT64_MAX	9223372036854775807LL
 #define ISC_UINT64_MAX	18446744073709551615ULL
 
-#endif /* ISC_INT_H */
+#endif /* GUARD_ISC_INT_H */
diff --git a/lib/isc/unix/include/isc/netdb.h b/lib/isc/unix/include/isc/netdb.h
index ff12a26..25cef14 100644
--- a/lib/isc/unix/include/isc/netdb.h
+++ b/lib/isc/unix/include/isc/netdb.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: netdb.h,v 1.11 2007/06/19 23:47:19 tbox Exp $ */
-
-#ifndef ISC_NETDB_H
-#define ISC_NETDB_H 1
+#ifndef GUARD_ISC_NETDB_H
+#define GUARD_ISC_NETDB_H 1
 
 /*****
  ***** Module Info
@@ -54,4 +52,4 @@
 
 #include <netdb.h>
 
-#endif /* ISC_NETDB_H */
+#endif /* GUARD_ISC_NETDB_H */
diff --git a/lib/isc/unix/include/isc/syslog.h b/lib/isc/unix/include/isc/syslog.h
index 7e0c88c..8dc306b 100644
--- a/lib/isc/unix/include/isc/syslog.h
+++ b/lib/isc/unix/include/isc/syslog.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: syslog.h,v 1.7 2007/06/19 23:47:19 tbox Exp $ */
-
-#ifndef ISC_SYSLOG_H
-#define ISC_SYSLOG_H 1
+#ifndef GUARD_ISC_SYSLOG_H
+#define GUARD_ISC_SYSLOG_H 1
 
 /*! \file */
 
@@ -44,4 +42,4 @@ isc_syslog_facilityfromstring(const char *str, int *facilityp);
 
 ISC_LANG_ENDDECLS
 
-#endif /* ISC_SYSLOG_H */
+#endif /* GUARD_ISC_SYSLOG_H */
diff --git a/lib/isc/unix/include/isc/time.h b/lib/isc/unix/include/isc/time.h
index 3d95a10..37f156c 100644
--- a/lib/isc/unix/include/isc/time.h
+++ b/lib/isc/unix/include/isc/time.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: time.h,v 1.40 2009/01/05 23:47:54 tbox Exp $ */
-
-#ifndef ISC_TIME_H
-#define ISC_TIME_H 1
+#ifndef GUARD_ISC_TIME_H
+#define GUARD_ISC_TIME_H 1
 
 /*! \file */
 
@@ -331,4 +329,4 @@ isc_time_formatISO8601(const isc_time_t *t, char *buf, unsigned int len);
 
 ISC_LANG_ENDDECLS
 
-#endif /* ISC_TIME_H */
+#endif /* GUARD_ISC_TIME_H */
diff --git a/lib/isc/win32/include/isc/bind_registry.h b/lib/isc/win32/include/isc/bind_registry.h
index c4dc876..0b6d071 100644
--- a/lib/isc/win32/include/isc/bind_registry.h
+++ b/lib/isc/win32/include/isc/bind_registry.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: bind_registry.h,v 1.8 2007/06/19 23:47:20 tbox Exp $ */
-
-#ifndef ISC_BINDREGISTRY_H
-#define ISC_BINDREGISTRY_H
+#ifndef GUARD_ISC_BINDREGISTRY_H
+#define GUARD_ISC_BINDREGISTRY_H
 
 /*
  * BIND makes use of the following Registry keys in various places, especially
@@ -47,4 +45,4 @@
 #define BIND_FOREGROUND		3
 #define BIND_PORT		4
 
-#endif /* ISC_BINDREGISTRY_H */
+#endif /* GUARD_ISC_BINDREGISTRY_H */
diff --git a/lib/isc/win32/include/isc/bindevt.h b/lib/isc/win32/include/isc/bindevt.h
index 72cf2d1..5b81a14 100644
--- a/lib/isc/win32/include/isc/bindevt.h
+++ b/lib/isc/win32/include/isc/bindevt.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: bindevt.h,v 1.6 2007/06/19 23:47:20 tbox Exp $ */
-
-#ifndef ISC_BINDEVT_H
-#define ISC_BINDEVT_H 1
+#ifndef GUARD_ISC_BINDEVT_H
+#define GUARD_ISC_BINDEVT_H 1
 
 /*
  * This is used for the event log for both logging the messages and
@@ -88,4 +86,4 @@
  */
 #define BIND_INFO_MSG		((DWORD)0x40000003L)
 
-#endif /* ISC_BINDEVT_H */
+#endif /* GUARD_ISC_BINDEVT_H */
diff --git a/lib/isc/win32/include/isc/condition.h b/lib/isc/win32/include/isc/condition.h
index 34015bc..e37e27d 100644
--- a/lib/isc/win32/include/isc/condition.h
+++ b/lib/isc/win32/include/isc/condition.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: condition.h,v 1.17 2007/06/18 23:47:49 tbox Exp $ */
-
-#ifndef ISC_CONDITION_H
-#define ISC_CONDITION_H 1
+#ifndef GUARD_ISC_CONDITION_H
+#define GUARD_ISC_CONDITION_H 1
 
 #include <windows.h>
 
@@ -64,4 +62,4 @@ isc_condition_waituntil(isc_condition_t *, isc_mutex_t *, isc_time_t *);
 
 ISC_LANG_ENDDECLS
 
-#endif /* ISC_CONDITION_H */
+#endif /* GUARD_ISC_CONDITION_H */
diff --git a/lib/isc/win32/include/isc/int.h b/lib/isc/win32/include/isc/int.h
index 2ee8bf9..ee965b0 100644
--- a/lib/isc/win32/include/isc/int.h
+++ b/lib/isc/win32/include/isc/int.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: int.h,v 1.13 2007/06/19 23:47:20 tbox Exp $ */
-
-#ifndef ISC_INT_H
-#define ISC_INT_H 1
+#ifndef GUARD_ISC_INT_H
+#define GUARD_ISC_INT_H 1
 
 #define _INTEGRAL_MAX_BITS 64
 #include <limits.h>
@@ -53,4 +51,4 @@ typedef unsigned __int64		isc_uint64_t;
 #define ISC_INT64_MAX	_I64_MAX
 #define ISC_UINT64_MAX	_UI64_MAX
 
-#endif /* ISC_INT_H */
+#endif /* GUARD_ISC_INT_H */
diff --git a/lib/isc/win32/include/isc/ipv6.h b/lib/isc/win32/include/isc/ipv6.h
index 1a6f427..ef24b7e 100644
--- a/lib/isc/win32/include/isc/ipv6.h
+++ b/lib/isc/win32/include/isc/ipv6.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id$ */
-
-#ifndef ISC_IPV6_H
-#define ISC_IPV6_H 1
+#ifndef GUARD_ISC_IPV6_H
+#define GUARD_ISC_IPV6_H 1
 
 /*****
  ***** Module Info
@@ -51,4 +49,4 @@
 LIBISC_EXTERNAL_DATA extern const struct in6_addr isc_net_in6addrany;
 LIBISC_EXTERNAL_DATA extern const struct in6_addr isc_net_in6addrloop;
 
-#endif /* ISC_IPV6_H */
+#endif /* GUARD_ISC_IPV6_H */
diff --git a/lib/isc/win32/include/isc/mutex.h b/lib/isc/win32/include/isc/mutex.h
index 5cf1bae..53eab3d 100644
--- a/lib/isc/win32/include/isc/mutex.h
+++ b/lib/isc/win32/include/isc/mutex.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mutex.h,v 1.22 2009/01/18 23:48:14 tbox Exp $ */
-
-#ifndef ISC_MUTEX_H
-#define ISC_MUTEX_H 1
+#ifndef GUARD_ISC_MUTEX_H
+#define GUARD_ISC_MUTEX_H 1
 
 #include <isc/net.h>
 #include <windows.h>
@@ -52,4 +50,4 @@ TryEnterCriticalSection(LPCRITICAL_SECTION lpCriticalSection);
  */
 #define isc_mutex_stats(fp) do {} while (0)
 
-#endif /* ISC_MUTEX_H */
+#endif /* GUARD_ISC_MUTEX_H */
diff --git a/lib/isc/win32/include/isc/net.h b/lib/isc/win32/include/isc/net.h
index b36f9b4..3f89682 100644
--- a/lib/isc/win32/include/isc/net.h
+++ b/lib/isc/win32/include/isc/net.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id$ */
-
-#ifndef ISC_NET_H
-#define ISC_NET_H 1
+#ifndef GUARD_ISC_NET_H
+#define GUARD_ISC_NET_H 1
 
 #include <errno.h>
 
@@ -370,4 +368,4 @@ isc_net_aton(const char *cp, struct in_addr *addr);
 
 ISC_LANG_ENDDECLS
 
-#endif /* ISC_NET_H */
+#endif /* GUARD_ISC_NET_H */
diff --git a/lib/isc/win32/include/isc/netdb.h b/lib/isc/win32/include/isc/netdb.h
index 6625afd..cdacf63 100644
--- a/lib/isc/win32/include/isc/netdb.h
+++ b/lib/isc/win32/include/isc/netdb.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: netdb.h,v 1.9 2007/06/19 23:47:20 tbox Exp $ */
-
-#ifndef ISC_NETDB_H
-#define ISC_NETDB_H 1
+#ifndef GUARD_ISC_NETDB_H
+#define GUARD_ISC_NETDB_H 1
 
 /*****
  ***** Module Info
@@ -51,4 +49,4 @@
 
 #include <isc/net.h>
 
-#endif /* ISC_NETDB_H */
+#endif /* GUARD_ISC_NETDB_H */
diff --git a/lib/isc/win32/include/isc/ntgroups.h b/lib/isc/win32/include/isc/ntgroups.h
index b4cd020..c709cf9 100644
--- a/lib/isc/win32/include/isc/ntgroups.h
+++ b/lib/isc/win32/include/isc/ntgroups.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ntgroups.h,v 1.5 2007/06/19 23:47:20 tbox Exp $ */
-
-#ifndef ISC_NTGROUPS_H
-#define ISC_NTGROUPS_H 1
+#ifndef GUARD_ISC_NTGROUPS_H
+#define GUARD_ISC_NTGROUPS_H 1
 
 #include <isc/lang.h>
 #include <isc/result.h>
@@ -32,4 +30,4 @@ isc_ntsecurity_getaccountgroups(char *name, char **Groups, unsigned int maxgroup
 
 ISC_LANG_ENDDECLS
 
-#endif /* ISC_NTGROUPS_H */
+#endif /* GUARD_ISC_NTGROUPS_H */
diff --git a/lib/isc/win32/include/isc/ntpaths.h b/lib/isc/win32/include/isc/ntpaths.h
index 39bcb62..e17ba4a 100644
--- a/lib/isc/win32/include/isc/ntpaths.h
+++ b/lib/isc/win32/include/isc/ntpaths.h
@@ -15,16 +15,14 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ntpaths.h,v 1.20 2009/07/14 22:54:57 each Exp $ */
-
 /*
  * Windows-specific path definitions
  * These routines are used to set up and return system-specific path
  * information about the files enumerated in NtPaths
  */
 
-#ifndef ISC_NTPATHS_H
-#define ISC_NTPATHS_H
+#ifndef GUARD_ISC_NTPATHS_H
+#define GUARD_ISC_NTPATHS_H
 
 #include <isc/lang.h>
 
@@ -69,4 +67,4 @@ isc_ntpaths_get(int);
 
 ISC_LANG_ENDDECLS
 
-#endif /* ISC_NTPATHS_H */
+#endif /* GUARD_ISC_NTPATHS_H */
diff --git a/lib/isc/win32/include/isc/offset.h b/lib/isc/win32/include/isc/offset.h
index f22fdce..f09d5e4 100644
--- a/lib/isc/win32/include/isc/offset.h
+++ b/lib/isc/win32/include/isc/offset.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: offset.h,v 1.6 2007/06/19 23:47:20 tbox Exp $ */
-
-#ifndef ISC_OFFSET_H
-#define ISC_OFFSET_H 1
+#ifndef GUARD_ISC_OFFSET_H
+#define GUARD_ISC_OFFSET_H 1
 
 /*
  * File offsets are operating-system dependent.
@@ -41,4 +39,4 @@ typedef _off_t isc_offset_t;
 	(~(((off_t)-1 >> (sizeof(off_t) * CHAR_BIT - 1)) \
 		      << (sizeof(off_t) * CHAR_BIT - 1)))
 
-#endif /* ISC_OFFSET_H */
+#endif /* GUARD_ISC_OFFSET_H */
diff --git a/lib/isc/win32/include/isc/once.h b/lib/isc/win32/include/isc/once.h
index 0dc1686..2c8422d 100644
--- a/lib/isc/win32/include/isc/once.h
+++ b/lib/isc/win32/include/isc/once.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: once.h,v 1.9 2007/06/19 23:47:20 tbox Exp $ */
-
-#ifndef ISC_ONCE_H
-#define ISC_ONCE_H 1
+#ifndef GUARD_ISC_ONCE_H
+#define GUARD_ISC_ONCE_H 1
 
 #include <isc/lang.h>
 #include <isc/result.h>
@@ -40,4 +38,4 @@ isc_once_do(isc_once_t *controller, void(*function)(void));
 
 ISC_LANG_ENDDECLS
 
-#endif /* ISC_ONCE_H */
+#endif /* GUARD_ISC_ONCE_H */
diff --git a/lib/isc/win32/include/isc/platform.h b/lib/isc/win32/include/isc/platform.h
index 94b8ba5..51f1f86 100644
--- a/lib/isc/win32/include/isc/platform.h
+++ b/lib/isc/win32/include/isc/platform.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: platform.h,v 1.19 2009/09/29 23:48:04 tbox Exp $ */
-
-#ifndef ISC_PLATFORM_H
-#define ISC_PLATFORM_H 1
+#ifndef GUARD_ISC_PLATFORM_H
+#define GUARD_ISC_PLATFORM_H 1
 
 /*****
  ***** Platform-dependent defines.
@@ -114,4 +112,4 @@
 #define LIBBIND9_EXTERNAL_DATA		ISC_DLLIMP
 #endif
 
-#endif /* ISC_PLATFORM_H */
+#endif /* GUARD_ISC_PLATFORM_H */
diff --git a/lib/isc/win32/include/isc/syslog.h b/lib/isc/win32/include/isc/syslog.h
index 765c0e5..bdd730d 100644
--- a/lib/isc/win32/include/isc/syslog.h
+++ b/lib/isc/win32/include/isc/syslog.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: syslog.h,v 1.5 2007/06/19 23:47:20 tbox Exp $ */
-
-#ifndef ISC_SYSLOG_H
-#define ISC_SYSLOG_H 1
+#ifndef GUARD_ISC_SYSLOG_H
+#define GUARD_ISC_SYSLOG_H 1
 
 #include <isc/lang.h>
 #include <isc/types.h>
@@ -42,4 +40,4 @@ isc_syslog_facilityfromstring(const char *str, int *facilityp);
 
 ISC_LANG_ENDDECLS
 
-#endif /* ISC_SYSLOG_H */
+#endif /* GUARD_ISC_SYSLOG_H */
diff --git a/lib/isc/win32/include/isc/thread.h b/lib/isc/win32/include/isc/thread.h
index 838d97c..c8cc1aa 100644
--- a/lib/isc/win32/include/isc/thread.h
+++ b/lib/isc/win32/include/isc/thread.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: thread.h,v 1.25 2009/09/29 04:37:08 marka Exp $ */
-
-#ifndef ISC_THREAD_H
-#define ISC_THREAD_H 1
+#ifndef GUARD_ISC_THREAD_H
+#define GUARD_ISC_THREAD_H 1
 
 #include <windows.h>
 
@@ -94,4 +92,4 @@ isc_thread_key_setspecific(isc_thread_key_t key, void *value);
 
 ISC_LANG_ENDDECLS
 
-#endif /* ISC_THREAD_H */
+#endif /* GUARD_ISC_THREAD_H */
diff --git a/lib/isc/win32/include/isc/time.h b/lib/isc/win32/include/isc/time.h
index 082b8b2..2d7223b 100644
--- a/lib/isc/win32/include/isc/time.h
+++ b/lib/isc/win32/include/isc/time.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: time.h,v 1.35 2009/01/05 23:47:54 tbox Exp $ */
-
-#ifndef ISC_TIME_H
-#define ISC_TIME_H 1
+#ifndef GUARD_ISC_TIME_H
+#define GUARD_ISC_TIME_H 1
 
 #include <windows.h>
 
@@ -288,4 +286,4 @@ isc_time_seconds(const isc_time_t *t);
 
 ISC_LANG_ENDDECLS
 
-#endif /* ISC_TIME_H */
+#endif /* GUARD_ISC_TIME_H */
diff --git a/lib/isc/win32/include/isc/win32os.h b/lib/isc/win32/include/isc/win32os.h
index bd40393..b7e6c0d 100644
--- a/lib/isc/win32/include/isc/win32os.h
+++ b/lib/isc/win32/include/isc/win32os.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: win32os.h,v 1.7 2009/06/25 23:48:02 tbox Exp $ */
-
-#ifndef ISC_WIN32OS_H
-#define ISC_WIN32OS_H 1
+#ifndef GUARD_ISC_WIN32OS_H
+#define GUARD_ISC_WIN32OS_H 1
 
 #include <isc/lang.h>
 
@@ -68,4 +66,4 @@ isc_win32os_versioncheck(unsigned int major, unsigned int minor,
 
 ISC_LANG_ENDDECLS
 
-#endif /* ISC_WIN32OS_H */
+#endif /* GUARD_ISC_WIN32OS_H */
diff --git a/lib/isc/win32/syslog.h b/lib/isc/win32/syslog.h
index fd4b3a6..7f98b30 100644
--- a/lib/isc/win32/syslog.h
+++ b/lib/isc/win32/syslog.h
@@ -15,10 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: syslog.h,v 1.7 2007/06/19 23:47:19 tbox Exp $ */
-
-#ifndef _SYSLOG_H
-#define _SYSLOG_H
+#ifndef GIARD_SYSLOG_H
+#define GUARD_SYSLOG_H
 
 #include <stdio.h>
 



More information about the vc mailing list