diff options
| author |   jakob <jakob@openbsd.org> | 2007-12-09 13:37:00 +0000 |
|---|---|---|
| committer | jakob <jakob@openbsd.org> | 2007-12-09 13:37:00 +0000 |
| commit | 75290b878677166fb160137e559260952e86a7d9 (patch) | |
| tree | 41bf2b12cf0f7ceff8a71597d4791d0618a9a4b8 /usr.sbin/bind/lib/isc/unix/time.c | |
| parent | Nuke evil common, spotted by martin@ (diff) | |
| download | wireguard-openbsd-75290b878677166fb160137e559260952e86a7d9.tar.xz wireguard-openbsd-75290b878677166fb160137e559260952e86a7d9.zip | |
resolve conflicts
Diffstat (limited to 'usr.sbin/bind/lib/isc/unix/time.c')
| -rw-r--r-- | usr.sbin/bind/lib/isc/unix/time.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/usr.sbin/bind/lib/isc/unix/time.c b/usr.sbin/bind/lib/isc/unix/time.c index 34cfde620d2..09d9686c251 100644 --- a/usr.sbin/bind/lib/isc/unix/time.c +++ b/usr.sbin/bind/lib/isc/unix/time.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2001, 2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,9 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $ISC: time.c,v 1.34.2.6.2.4 2004/03/06 08:15:03 marka Exp $ */ +/* $ISC: time.c,v 1.47.18.2 2005/04/29 00:17:09 marka Exp $ */ + +/*! \file */ #include <config.h> @@ -33,9 +35,9 @@ #include <isc/time.h> #include <isc/util.h> -#define NS_PER_S 1000000000 /* Nanoseconds per second. */ -#define NS_PER_US 1000 /* Nanoseconds per microsecond. */ -#define US_PER_S 1000000 /* Microseconds per second. */ +#define NS_PER_S 1000000000 /*%< Nanoseconds per second. */ +#define NS_PER_US 1000 /*%< Nanoseconds per microsecond. */ +#define US_PER_S 1000000 /*%< Microseconds per second. */ /* * All of the INSIST()s checks of nanoseconds < NS_PER_S are for @@ -48,7 +50,7 @@ #define ISC_FIX_TV_USEC 1 #endif -/*** +/*% *** Intervals ***/ |