From 88cd8aca9efa1e5b867ac498b98e972638f7aee8 Mon Sep 17 00:00:00 2001
From: David Hankins <dhankins@isc.org>
Date: Fri, 24 Feb 2006 23:16:32 +0000
Subject: - Merge changes between 3.0.3RC1 and 3.0.4-BETA-3 into HEAD (silence 
  robie).

---
 common/dispatch.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'common/dispatch.c')

diff --git a/common/dispatch.c b/common/dispatch.c
index ce9d1ba3..60a05251 100644
--- a/common/dispatch.c
+++ b/common/dispatch.c
@@ -3,7 +3,7 @@
    Network input dispatcher... */
 
 /*
- * Copyright (c) 2004 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
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: dispatch.c,v 1.65 2005/03/17 20:14:57 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: dispatch.c,v 1.66 2006/02/24 23:16:28 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -42,7 +42,7 @@ static char copyright[] =
 struct timeout *timeouts;
 static struct timeout *free_timeouts;
 
-void set_time (u_int32_t t)
+void set_time(TIME t)
 {
 	/* Do any outstanding timeouts. */
 	if (cur_time != t) {
-- 
cgit v1.2.1