From 98bd7ca0990e6d88e3345d3bc966ebe8216691a7 Mon Sep 17 00:00:00 2001
From: David Hankins <dhankins@isc.org>
Date: Tue, 8 May 2007 23:05:22 +0000
Subject: DHCPv6 branch merged to HEAD.

---
 includes/dhcp.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'includes/dhcp.h')

diff --git a/includes/dhcp.h b/includes/dhcp.h
index 1be7b04f..9636043b 100644
--- a/includes/dhcp.h
+++ b/includes/dhcp.h
@@ -3,7 +3,7 @@
    Protocol structures... */
 
 /*
- * Copyright (c) 2004-2005 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2006 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1995-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -30,6 +30,9 @@
  * To learn more about Vixie Enterprises, see ``http://www.vix.com''.
  */
 
+#ifndef DHCP_H
+#define DHCP_H
+
 #define DHCP_UDP_OVERHEAD	(20 + /* IP header */			\
 			8)   /* UDP header */
 #define DHCP_SNAME_LEN		64
@@ -197,3 +200,6 @@ struct dhcp_packet {
 
 /* Enterprise Suboptions: */
 #define VENDOR_ISC_SUBOPTIONS		2495
+
+#endif /* DHCP_H */
+
-- 
cgit v1.2.1