diff options
| author | asmodai <asmodai@FreeBSD.org> | 2001-07-30 16:55:52 +0000 |
|---|---|---|
| committer | asmodai <asmodai@FreeBSD.org> | 2001-07-30 16:55:52 +0000 |
| commit | c25217007ca343d3c1138f765468e38626ec0c2d (patch) | |
| tree | 30ec9b6347fecc1da2511040c1ce4e1edc72dbf6 /contrib/bind/port | |
| parent | dcb55fc8706d6ff08b4d3ffb0210c90f065d172a (diff) | |
| download | FreeBSD-src-c25217007ca343d3c1138f765468e38626ec0c2d.zip FreeBSD-src-c25217007ca343d3c1138f765468e38626ec0c2d.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'contrib/bind/port')
| -rw-r--r-- | contrib/bind/port/freebsd/include/port_after.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/contrib/bind/port/freebsd/include/port_after.h b/contrib/bind/port/freebsd/include/port_after.h index 048d9df..1c06dd1 100644 --- a/contrib/bind/port/freebsd/include/port_after.h +++ b/contrib/bind/port/freebsd/include/port_after.h @@ -33,6 +33,7 @@ #if (!defined(BSD)) || (BSD < 199306) #include <sys/bitypes.h> #endif +#include <sys/time.h> /* * We need to know the IPv6 address family number even on IPv4-only systems. @@ -79,4 +80,7 @@ struct sockaddr_in6 { #define ISC_FACILITY LOG_DAEMON #endif +int isc__gettimeofday(struct timeval *tp, struct timezone *tzp); +#define gettimeofday isc__gettimeofday + #endif /* ! PORT_AFTER_H */ |
