diff options
author | ume <ume@FreeBSD.org> | 2007-06-03 17:20:27 +0000 |
---|---|---|
committer | ume <ume@FreeBSD.org> | 2007-06-03 17:20:27 +0000 |
commit | 1f0b78cb3e02e3e161fed2e61d1cf1d0fb386365 (patch) | |
tree | 4c177bc1c465cdceae9dd1ea93c01fa64b220b93 /lib/libc/isc | |
parent | 09efba1c33e3e58c865d7f628c4f48e47d74bcd0 (diff) | |
download | FreeBSD-src-1f0b78cb3e02e3e161fed2e61d1cf1d0fb386365.zip FreeBSD-src-1f0b78cb3e02e3e161fed2e61d1cf1d0fb386365.tar.gz |
Merge BIND 9.4.1 into main chunk.
MFC after: 2 weeks
Diffstat (limited to 'lib/libc/isc')
-rw-r--r-- | lib/libc/isc/ev_streams.c | 4 | ||||
-rw-r--r-- | lib/libc/isc/ev_timers.c | 4 | ||||
-rw-r--r-- | lib/libc/isc/eventlib_p.h | 15 |
3 files changed, 14 insertions, 9 deletions
diff --git a/lib/libc/isc/ev_streams.c b/lib/libc/isc/ev_streams.c index 4ad82cf..06bdfad 100644 --- a/lib/libc/isc/ev_streams.c +++ b/lib/libc/isc/ev_streams.c @@ -20,7 +20,7 @@ */ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: ev_streams.c,v 1.2.206.2 2004/03/17 00:29:51 marka Exp $"; +static const char rcsid[] = "$Id: ev_streams.c,v 1.4.18.1 2005/04/27 05:01:06 sra Exp $"; #endif #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); @@ -314,3 +314,5 @@ readable(evContext opaqueCtx, void *uap, int fd, int evmask) { done(opaqueCtx, str); } #endif + +/*! \file */ diff --git a/lib/libc/isc/ev_timers.c b/lib/libc/isc/ev_timers.c index 47c3dcf..66fc186 100644 --- a/lib/libc/isc/ev_timers.c +++ b/lib/libc/isc/ev_timers.c @@ -20,7 +20,7 @@ */ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: ev_timers.c,v 1.2.2.1.4.5 2004/03/17 02:39:13 marka Exp $"; +static const char rcsid[] = "$Id: ev_timers.c,v 1.5.18.1 2005/04/27 05:01:06 sra Exp $"; #endif #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); @@ -511,3 +511,5 @@ idle_timeout(evContext opaqueCtx, } } #endif + +/*! \file */ diff --git a/lib/libc/isc/eventlib_p.h b/lib/libc/isc/eventlib_p.h index 256279e..951af00 100644 --- a/lib/libc/isc/eventlib_p.h +++ b/lib/libc/isc/eventlib_p.h @@ -15,10 +15,11 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* eventlib_p.h - private interfaces for eventlib - * vix 09sep95 [initial] +/*! \file + * \brief private interfaces for eventlib + * \author vix 09sep95 [initial] * - * $Id: eventlib_p.h,v 1.3.2.1.4.4 2006/03/10 00:17:21 marka Exp $ + * $Id: eventlib_p.h,v 1.5.18.4 2006/03/10 00:20:08 marka Exp $ * $FreeBSD$ */ @@ -80,9 +81,9 @@ typedef struct evConn { void * uap; int fd; int flags; -#define EV_CONN_LISTEN 0x0001 /* Connection is a listener. */ -#define EV_CONN_SELECTED 0x0002 /* evSelectFD(conn->file). */ -#define EV_CONN_BLOCK 0x0004 /* Listener fd was blocking. */ +#define EV_CONN_LISTEN 0x0001 /*%< Connection is a listener. */ +#define EV_CONN_SELECTED 0x0002 /*%< evSelectFD(conn->file). */ +#define EV_CONN_BLOCK 0x0004 /*%< Listener fd was blocking. */ evFileID file; struct evConn * prev; struct evConn * next; @@ -130,7 +131,7 @@ typedef struct evStream { evFileID file; evTimerID timer; int flags; -#define EV_STR_TIMEROK 0x0001 /* IFF timer valid. */ +#define EV_STR_TIMEROK 0x0001 /*%< IFF timer valid. */ int fd; struct iovec * iovOrig; int iovOrigCount; |