Index: contrib/isc-dhcp/client/dhclient.c
===================================================================
RCS file: /home/ncvs/src/contrib/isc-dhcp/client/dhclient.c,v
retrieving revision 1.37
diff -u -r1.37 dhclient.c
--- contrib/isc-dhcp/client/dhclient.c	26 Jun 2004 10:37:41 -0000	1.37
+++ contrib/isc-dhcp/client/dhclient.c	28 Jun 2004 20:38:16 -0000
@@ -46,7 +46,7 @@
 #include <net80211/ieee80211.h>
 #endif
 
-TIME cur_time;
+extern TIME cur_time;
 TIME default_lease_time = 43200; /* 12 hours... */
 TIME max_lease_time = 86400; /* 24 hours... */
 
Index: contrib/isc-dhcp/common/dispatch.c
===================================================================
RCS file: /home/ncvs/src/contrib/isc-dhcp/common/dispatch.c,v
retrieving revision 1.5
diff -u -r1.5 dispatch.c
--- contrib/isc-dhcp/common/dispatch.c	26 Jun 2004 10:37:41 -0000	1.5
+++ contrib/isc-dhcp/common/dispatch.c	28 Jun 2004 20:38:16 -0000
@@ -47,7 +47,7 @@
 extern int polling_interval;
 #endif
 
-void set_time (u_int32_t t)
+void set_time (TIME t)
 {
 	/* Do any outstanding timeouts. */
 	if (cur_time != t) {
@@ -95,7 +95,6 @@
 	struct timeval *tvp_new;
 #endif
 	isc_result_t status;
-	TIME cur_time;
 
 	tvp = NULL;
 #ifdef ENABLE_POLLING_MODE
Index: contrib/isc-dhcp/includes/dhcpd.h
===================================================================
RCS file: /home/ncvs/src/contrib/isc-dhcp/includes/dhcpd.h,v
retrieving revision 1.9
diff -u -r1.9 dhcpd.h
--- contrib/isc-dhcp/includes/dhcpd.h	26 Jun 2004 10:37:42 -0000	1.9
+++ contrib/isc-dhcp/includes/dhcpd.h	28 Jun 2004 20:38:16 -0000
@@ -335,7 +335,7 @@
 	struct option_state *options;
 	struct data_string parameter_request_list;
 	int max_message_size;
-	u_int32_t expiry, renewal, rebind;
+	TIME expiry, renewal, rebind;
 	struct data_string filename, server_name;
 	int got_requested_address;
 	int got_server_identifier;
@@ -1764,7 +1764,7 @@
 void reinitialize_interfaces PROTO ((void));
 
 /* dispatch.c */
-void set_time (u_int32_t);
+void set_time (TIME);
 struct timeval *process_outstanding_timeouts (struct timeval *);
 void dispatch PROTO ((void));
 isc_result_t got_one PROTO ((omapi_object_t *));
Index: contrib/isc-dhcp/omapip/dispatch.c
===================================================================
RCS file: /home/ncvs/src/contrib/isc-dhcp/omapip/dispatch.c,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 dispatch.c
--- contrib/isc-dhcp/omapip/dispatch.c	26 Jun 2004 10:34:24 -0000	1.1.1.2
+++ contrib/isc-dhcp/omapip/dispatch.c	28 Jun 2004 20:38:16 -0000
@@ -35,7 +35,7 @@
 #include <omapip/omapip_p.h>
 
 static omapi_io_object_t omapi_io_states;
-u_int32_t cur_time;
+TIME cur_time;
 
 OMAPI_OBJECT_ALLOC (omapi_io,
 		    omapi_io_object_t, omapi_type_io_object)
Index: contrib/isc-dhcp/omapip/mrtrace.c
===================================================================
RCS file: /home/ncvs/src/contrib/isc-dhcp/omapip/mrtrace.c,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 mrtrace.c
--- contrib/isc-dhcp/omapip/mrtrace.c	26 Jun 2004 10:34:24 -0000	1.1.1.2
+++ contrib/isc-dhcp/omapip/mrtrace.c	28 Jun 2004 20:38:16 -0000
@@ -61,7 +61,7 @@
 int trace_mr_select (int, fd_set *, fd_set *, fd_set *, struct timeval *);
 unsigned int trace_mr_res_randomid (unsigned int);
 
-extern time_t cur_time;
+extern TIME cur_time;
 
 #if defined (TRACING)
 void trace_mr_init ()