Index: head/lib/bind/bind/config.h =================================================================== --- head/lib/bind/bind/config.h (revision 186462) +++ head/lib/bind/bind/config.h (revision 186463) @@ -1,64 +1,71 @@ /* $FreeBSD$ */ -/* config.h. Generated by configure. */ +/* config.h. Generated from config.h.in by configure. */ /* #undef _SOCKADDR_LEN */ #define HAVE_FCNTL_H 1 #define HAVE_PATHS_H 1 #define HAVE_INTTYPES_H 1 /* #undef HAVE_STROPTS_H */ #define HAVE_SYS_TIMERS_H 1 #define HAVE_SYS_SELECT_H 1 +#define HAVE_MEMORY_H 1 /* #undef SYS_CDEFS_H */ /* #undef _POSIX_PTHREAD_SEMANTICS */ /* #undef POSIX_GETPWUID_R */ /* #undef POSIX_GETPWNAM_R */ /* #undef POSIX_GETGRGID_R */ /* #undef POSIX_GETGRNAM_R */ #define HAVE_MEMMOVE 1 #define HAVE_MEMCHR 1 +/* #undef SPRINTF_CHAR */ +/* #undef VSPRINTF_CHAR */ +#define USE_SYSERROR_LIST 1 +/* #undef NEED_STRTOUL */ +/* #undef NEED_SUN4PROTOS */ +/* #undef REENABLE_SEND */ /* #undef NEED_SETGROUPENT */ /* #undef NEED_GETGROUPLIST */ /* define if prototype for getgrnam_r() is required */ -/* #undef NEED_GETGRNAM_R */ -/* #undef NEED_GETGRGID_R */ -/* #undef NEED_GETGRENT_R */ +/* #undef NEED_GETGRNAM_R */ +/* #undef NEED_GETGRGID_R */ +/* #undef NEED_GETGRENT_R */ #define NEED_SETGRENT_R 1 #define NEED_ENDGRENT_R 1 #define NEED_INNETGR_R 1 /* #undef NEED_SETNETGRENT_R */ #define NEED_ENDNETGRENT_R 1 /* #undef NEED_GETPWNAM_R */ /* #undef NEED_GETPWUID_R */ #define NEED_SETPWENT_R 1 #define NEED_SETPASSENT_R 1 #define NEED_SETPWENT_R 1 /* #undef NEED_GETPWENT_R */ #define NEED_ENDPWENT_R 1 /* #undef NEED_SETPASSENT */ #define HAS_PW_CLASS 1 /* #undef ssize_t */ /* #undef uintptr_t */ -/* Shut up warnings about sputaux in stdio.h on BSD/OS pre-4.1 */ +/* Shut up warnings about sputaux in stdio.h on BSD/OS pre-4.1 */ /* #undef SHUTUP_SPUTAUX */ #ifdef SHUTUP_SPUTAUX struct __sFILE; extern __inline int __sputaux(int _c, struct __sFILE *_p); #endif /* #undef BROKEN_IN6ADDR_INIT_MACROS */ #define HAVE_STRLCAT 1 /* Shut up warnings about missing braces */ /* #undef SHUTUP_MUTEX_INITIALIZER */ #ifdef SHUTUP_MUTEX_INITIALIZER #define LIBBIND_MUTEX_INITIALIZER { PTHREAD_MUTEX_INITIALIZER } #else #define LIBBIND_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER #endif Index: head/lib/bind/bind/port_after.h =================================================================== --- head/lib/bind/bind/port_after.h (revision 186462) +++ head/lib/bind/bind/port_after.h (revision 186463) @@ -1,417 +1,509 @@ /* $FreeBSD$ */ #ifndef port_after_h #define port_after_h #include #include #include #include #include #if (!defined(BSD)) || (BSD < 199306) #include #endif #ifdef HAVE_INTTYPES_H #include #endif #ifdef HAVE_SYS_SELECT_H #include #endif /* HAVE_SYS_SELECT_H */ +#ifdef REENABLE_SEND +#undef send +#endif + #undef NEED_PSELECT #define HAVE_SA_LEN 1 #define HAVE_MINIMUM_IFREQ 1 #undef NEED_DAEMON #undef NEED_STRSEP #undef NEED_STRERROR +#ifdef NEED_STRERROR +const char *isc_strerror(int); +#define strerror isc_strerror +#endif #define HAS_INET6_STRUCTS 1 #define HAVE_SIN6_SCOPE_ID 1 #undef NEED_IN6ADDR_ANY #undef HAS_IN_ADDR6 #define HAVE_SOCKADDR_STORAGE 1 #undef NEED_GETTIMEOFDAY #define HAVE_STRNDUP 1 #undef USE_FIONBIO_IOCTL -#undef USE_SYSERROR_LIST #undef INNETGR_ARGS #undef SETNETGRENT_ARGS #define USE_IFNAMELINKID 1 #define PORT_NONBLOCK O_NONBLOCK +#ifndef _POSIX_PATH_MAX +#define _POSIX_PATH_MAX 255 +#endif +#ifndef PATH_MAX +#define PATH_MAX _POSIX_PATH_MAX +#endif + /* * We need to know the IPv6 address family number even on IPv4-only systems. * Note that this is NOT a protocol constant, and that if the system has its * own AF_INET6, different from ours below, all of BIND's libraries and * executables will need to be recompiled after the system * has had this type added. The type number below is correct on most BSD- * derived systems for which AF_INET6 is defined. */ #ifndef AF_INET6 #define AF_INET6 24 #endif #ifndef PF_INET6 #define PF_INET6 AF_INET6 #endif #ifdef HAS_IN_ADDR6 /* Map to pre-RFC structure. */ #define in6_addr in_addr6 #endif #ifndef HAS_INET6_STRUCTS /* Replace with structure from later rev of O/S if known. */ struct in6_addr { u_int8_t s6_addr[16]; }; #define IN6ADDR_ANY_INIT \ {{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }} #define IN6ADDR_LOOPBACK_INIT \ {{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }} /* Replace with structure from later rev of O/S if known. */ struct sockaddr_in6 { #ifdef HAVE_SA_LEN u_int8_t sin6_len; /* length of this struct */ u_int8_t sin6_family; /* AF_INET6 */ #else u_int16_t sin6_family; /* AF_INET6 */ #endif u_int16_t sin6_port; /* transport layer port # */ u_int32_t sin6_flowinfo; /* IPv6 flow information */ struct in6_addr sin6_addr; /* IPv6 address */ u_int32_t sin6_scope_id; /* set of interfaces for a scope */ }; #endif /* HAS_INET6_STRUCTS */ #ifdef BROKEN_IN6ADDR_INIT_MACROS #undef IN6ADDR_ANY_INIT #undef IN6ADDR_LOOPBACK_INIT #endif #ifdef _AIX #ifndef IN6ADDR_ANY_INIT #define IN6ADDR_ANY_INIT {{{ 0, 0, 0, 0 }}} #endif #ifndef IN6ADDR_LOOPBACK_INIT #if BYTE_ORDER == BIG_ENDIAN #define IN6ADDR_LOOPBACK_INIT {{{ 0, 0, 0, 1 }}} #else #define IN6ADDR_LOOPBACK_INIT {{{0, 0, 0, 0x01000000}}} #endif #endif #endif #ifndef IN6ADDR_ANY_INIT #ifdef s6_addr #define IN6ADDR_ANY_INIT \ {{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }}} #else #define IN6ADDR_ANY_INIT \ {{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }} #endif #endif #ifndef IN6ADDR_LOOPBACK_INIT #ifdef s6_addr #define IN6ADDR_LOOPBACK_INIT \ {{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }}} #else #define IN6ADDR_LOOPBACK_INIT \ {{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }} #endif #endif #ifndef HAVE_SOCKADDR_STORAGE #define __SS_MAXSIZE 128 #define __SS_ALLIGSIZE (sizeof (long)) struct sockaddr_storage { #ifdef HAVE_SA_LEN u_int8_t ss_len; /* address length */ u_int8_t ss_family; /* address family */ char __ss_pad1[__SS_ALLIGSIZE - 2 * sizeof(u_int8_t)]; long __ss_align; char __ss_pad2[__SS_MAXSIZE - 2 * __SS_ALLIGSIZE]; #else u_int16_t ss_family; /* address family */ char __ss_pad1[__SS_ALLIGSIZE - sizeof(u_int16_t)]; long __ss_align; char __ss_pad2[__SS_MAXSIZE - 2 * __SS_ALLIGSIZE]; #endif }; #endif #if !defined(HAS_INET6_STRUCTS) || defined(NEED_IN6ADDR_ANY) #define in6addr_any isc_in6addr_any extern const struct in6_addr in6addr_any; #endif /* * IN6_ARE_ADDR_EQUAL, IN6_IS_ADDR_UNSPECIFIED, IN6_IS_ADDR_V4COMPAT and * IN6_IS_ADDR_V4MAPPED are broken in glibc 2.1. */ #ifdef __GLIBC__ #if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2) #undef IN6_ARE_ADDR_EQUAL #undef IN6_IS_ADDR_UNSPECIFIED #undef IN6_IS_ADDR_V4COMPAT #undef IN6_IS_ADDR_V4MAPPED #endif #endif #ifndef IN6_ARE_ADDR_EQUAL #define IN6_ARE_ADDR_EQUAL(a,b) \ (memcmp(&(a)->s6_addr[0], &(b)->s6_addr[0], sizeof(struct in6_addr)) == 0) #endif #ifndef IN6_IS_ADDR_UNSPECIFIED #define IN6_IS_ADDR_UNSPECIFIED(a) \ IN6_ARE_ADDR_EQUAL(a, &in6addr_any) #endif #ifndef IN6_IS_ADDR_LOOPBACK extern const struct in6_addr isc_in6addr_loopback; #define IN6_IS_ADDR_LOOPBACK(a) \ IN6_ARE_ADDR_EQUAL(a, &isc_in6addr_loopback) #endif #ifndef IN6_IS_ADDR_V4MAPPED #define IN6_IS_ADDR_V4MAPPED(a) \ ((a)->s6_addr[0] == 0x00 && (a)->s6_addr[1] == 0x00 && \ (a)->s6_addr[2] == 0x00 && (a)->s6_addr[3] == 0x00 && \ (a)->s6_addr[4] == 0x00 && (a)->s6_addr[5] == 0x00 && \ (a)->s6_addr[6] == 0x00 && (a)->s6_addr[9] == 0x00 && \ (a)->s6_addr[8] == 0x00 && (a)->s6_addr[9] == 0x00 && \ (a)->s6_addr[10] == 0xff && (a)->s6_addr[11] == 0xff) #endif #ifndef IN6_IS_ADDR_SITELOCAL #define IN6_IS_ADDR_SITELOCAL(a) \ (((a)->s6_addr[0] == 0xfe) && (((a)->s6_addr[1] & 0xc0) == 0xc0)) #endif #ifndef IN6_IS_ADDR_LINKLOCAL #define IN6_IS_ADDR_LINKLOCAL(a) \ (((a)->s6_addr[0] == 0xfe) && (((a)->s6_addr[1] & 0xc0) == 0x80)) #endif #ifndef IN6_IS_ADDR_MULTICAST #define IN6_IS_ADDR_MULTICAST(a) ((a)->s6_addr[0] == 0xff) #endif #ifndef __IPV6_ADDR_MC_SCOPE #define __IPV6_ADDR_MC_SCOPE(a) ((a)->s6_addr[1] & 0x0f) #endif #ifndef __IPV6_ADDR_SCOPE_SITELOCAL #define __IPV6_ADDR_SCOPE_SITELOCAL 0x05 #endif #ifndef __IPV6_ADDR_SCOPE_ORGLOCAL #define __IPV6_ADDR_SCOPE_ORGLOCAL 0x08 #endif #ifndef IN6_IS_ADDR_MC_SITELOCAL #define IN6_IS_ADDR_MC_SITELOCAL(a) \ (IN6_IS_ADDR_MULTICAST(a) && \ (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_SITELOCAL)) #endif #ifndef IN6_IS_ADDR_MC_ORGLOCAL #define IN6_IS_ADDR_MC_ORGLOCAL(a) \ (IN6_IS_ADDR_MULTICAST(a) && \ (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_ORGLOCAL)) #endif #ifndef INADDR_NONE #define INADDR_NONE 0xffffffff #endif #ifndef MAXHOSTNAMELEN #define MAXHOSTNAMELEN 256 #endif #ifndef INET6_ADDRSTRLEN /* sizeof("aaaa:bbbb:cccc:dddd:eeee:ffff:123.123.123.123") */ #define INET6_ADDRSTRLEN 46 #endif #ifndef MIN #define MIN(x,y) (((x) <= (y)) ? (x) : (y)) #endif #ifndef MAX #define MAX(x,y) (((x) >= (y)) ? (x) : (y)) #endif #ifdef NEED_DAEMON int daemon(int nochdir, int noclose); #endif #ifdef NEED_STRSEP char * strsep(char **stringp, const char *delim); #endif #ifndef ALIGN #define ALIGN(p) (((uintptr_t)(p) + (sizeof(long) - 1)) & ~(sizeof(long) - 1)) #endif #ifdef NEED_SETGROUPENT int setgroupent(int stayopen); #endif #ifdef NEED_GETGROUPLIST int getgrouplist(GETGROUPLIST_ARGS); #endif #ifdef POSIX_GETGRNAM_R int __posix_getgrnam_r(const char *, struct group *, char *, int, struct group **); #endif #ifdef NEED_GETGRNAM_R int getgrnam_r(const char *, struct group *, char *, size_t, struct group **); #endif #ifdef POSIX_GETGRGID_R int __posix_getgrgid_r(gid_t, struct group *, char *, int, struct group **) ; #endif #ifdef NEED_GETGRGID_R int getgrgid_r(gid_t, struct group *, char *, size_t, struct group **); #endif #ifdef NEED_GETGRENT_R GROUP_R_RETURN getgrent_r(struct group *gptr, GROUP_R_ARGS); #endif #ifdef NEED_SETGRENT_R GROUP_R_SET_RETURN setgrent_r(GROUP_R_ENT_ARGS); #endif #ifdef NEED_ENDGRENT_R GROUP_R_END_RETURN endgrent_r(GROUP_R_ENT_ARGS); #endif #if defined(NEED_INNETGR_R) && defined(NGR_R_RETURN) NGR_R_RETURN innetgr_r(const char *, const char *, const char *, const char *); #endif #ifdef NEED_SETNETGRENT_R -#ifdef NGR_R_ENT_ARGS -NGR_R_SET_RETURN setnetgrent_r(const char *netgroup, NGR_R_ENT_ARGS); +#ifdef NGR_R_SET_ARGS +NGR_R_SET_RETURN setnetgrent_r(NGR_R_SET_CONST char *netgroup, NGR_R_SET_ARGS); #else -NGR_R_SET_RETURN setnetgrent_r(const char *netgroup); +NGR_R_SET_RETURN setnetgrent_r(NGR_R_SET_CONST char *netgroup); #endif #endif #ifdef NEED_ENDNETGRENT_R -#ifdef NGR_R_ENT_ARGS -NGR_R_END_RETURN endnetgrent_r(NGR_R_ENT_ARGS); +#ifdef NGR_R_END_ARGS +NGR_R_END_RETURN endnetgrent_r(NGR_R_END_ARGS); #else NGR_R_END_RETURN endnetgrent_r(void); #endif #endif #ifdef POSIX_GETPWNAM_R int __posix_getpwnam_r(const char *login, struct passwd *pwptr, char *buf, size_t buflen, struct passwd **result); #endif #ifdef NEED_GETPWNAM_R int getpwnam_r(const char *login, struct passwd *pwptr, char *buf, size_t buflen, struct passwd **result); #endif #ifdef POSIX_GETPWUID_R int __posix_getpwuid_r(uid_t uid, struct passwd *pwptr, char *buf, int buflen, struct passwd **result); #endif #ifdef NEED_GETPWUID_R int getpwuid_r(uid_t uid, struct passwd *pwptr, char *buf, size_t buflen, struct passwd **result); #endif #ifdef NEED_SETPWENT_R #ifdef PASS_R_ENT_ARGS PASS_R_SET_RETURN setpwent_r(PASS_R_ENT_ARGS); #else PASS_R_SET_RETURN setpwent_r(void); #endif #endif #ifdef NEED_SETPASSENT_R #ifdef PASS_R_ENT_ARGS PASS_R_SET_RETURN setpassent_r(int stayopen, PASS_R_ENT_ARGS); #else PASS_R_SET_RETURN setpassent_r(int stayopen); #endif #endif #ifdef NEED_GETPWENT_R PASS_R_RETURN getpwent_r(struct passwd *pwptr, PASS_R_ARGS); #endif #ifdef NEED_ENDPWENT_R void endpwent_r(void); #endif #ifdef NEED_SETPASSENT int setpassent(int stayopen); #endif #define gettimeofday isc__gettimeofday #ifdef NEED_GETTIMEOFDAY int isc__gettimeofday(struct timeval *tvp, struct _TIMEZONE *tzp); #else int isc__gettimeofday(struct timeval *tp, struct timezone *tzp); #endif -int getnetgrent(char **machinep, char **userp, char **domainp); +int getnetgrent(NGR_R_CONST char **machinep, NGR_R_CONST char **userp, + NGR_R_CONST char **domainp); #ifdef NGR_R_ARGS -int getnetgrent_r(char **machinep, char **userp, char **domainp, NGR_R_ARGS); +int getnetgrent_r(NGR_R_CONST char **machinep, NGR_R_CONST char **userp, + NGR_R_CONST char **domainp, NGR_R_ARGS); #endif #ifdef SETNETGRENT_ARGS void setnetgrent(SETNETGRENT_ARGS); #else void setnetgrent(const char *netgroup); #endif void endnetgrent(void); #ifdef INNETGR_ARGS int innetgr(INNETGR_ARGS); #else int innetgr(const char *netgroup, const char *machine, const char *user, const char *domain); #endif -#ifdef NGR_R_ENT_ARGS +#ifdef NGR_R_SET_ARGS NGR_R_SET_RETURN -setnetgrent_r(const char *netgroup, NGR_R_ENT_ARGS); +setnetgrent_r(NGR_R_SET_CONST char *netgroup, NGR_R_SET_ARGS); #else NGR_R_SET_RETURN -setnetgrent_r(const char *netgroup); +setnetgrent_r(NGR_R_SET_CONST char *netgroup); #endif + +#ifdef NEED_STRTOUL +unsigned long strtoul(const char *, char **, int); +#endif + +#ifdef NEED_SUN4PROTOS +#include +#ifndef __SIZE_TYPE__ +#define __SIZE_TYPE__ int +#endif +struct sockaddr; +struct iovec; +struct timeval; +struct timezone; +int fprintf(FILE *, const char *, ...); +int getsockname(int, struct sockaddr *, int *); +int getpeername(int, struct sockaddr *, int *); +int socket(int, int, int); +int connect(int, const struct sockaddr *, int); +int writev(int, struct iovec *, int); +int readv(int, struct iovec *, int); +int send(int, const char *, int, int); +void bzero(char *, int); +int recvfrom(int, char *, int, int, struct sockaddr *, int *); +int syslog(int, const char *, ... ); +int printf(const char *, ...); +__SIZE_TYPE__ fread(void *, __SIZE_TYPE__, __SIZE_TYPE__, FILE *); +__SIZE_TYPE__ fwrite(const void *, __SIZE_TYPE__, __SIZE_TYPE__, FILE *); +int fclose(FILE *); +int ungetc(int, FILE *); +int scanf(const char *, ...); +int sscanf(const char *, const char *, ... ); +int tolower(int); +int toupper(int); +int strcasecmp(const char *, const char *); +int strncasecmp(const char *, const char *, int); +int select(int, fd_set *, fd_set *, fd_set *, struct timeval *); +#ifdef gettimeofday +#undef gettimeofday +int gettimeofday(struct timeval *, struct timezone *); +#define gettimeofday isc__gettimeofday +#else +int gettimeofday(struct timeval *, struct timezone *); +#endif +long strtol(const char*, char **, int); +int fseek(FILE *, long, int); +int setsockopt(int, int, int, const char *, int); +int bind(int, const struct sockaddr *, int); +void bcopy(char *, char *, int); +int fputc(char, FILE *); +int listen(int, int); +int accept(int, struct sockaddr *, int *); +int getsockopt(int, int, int, char *, int *); +int vfprintf(FILE *, const char *, va_list); +int fflush(FILE *); +int fgetc(FILE *); +int fputs(const char *, FILE *); +int fchown(int, int, int); +void setbuf(FILE *, char *); +int gethostname(char *, int); +int rename(const char *, const char *); +time_t time(time_t *); +int fscanf(FILE *, const char *, ...); +int sscanf(const char *, const char *, ...); +int ioctl(int, int, caddr_t); +void perror(const char *); + +#if !defined(__USE_FIXED_PROTOTYPES__) && !defined(__cplusplus) && !defined(__STRICT_ANSI__) +/* + * 'gcc -ansi' changes the prototype for vsprintf(). + * Use this prototype when 'gcc -ansi' is not in effect. + */ +char *vsprintf(char *, const char *, va_list); +#endif +#endif + #endif Index: head/lib/bind/bind/port_before.h =================================================================== --- head/lib/bind/bind/port_before.h (revision 186462) +++ head/lib/bind/bind/port_before.h (revision 186463) @@ -1,164 +1,175 @@ /* $FreeBSD$ */ #ifndef port_before_h #define port_before_h #include +#ifdef NEED_SUN4PROTOS +#define _PARAMS(x) x +#endif + struct group; /* silence warning */ struct passwd; /* silence warning */ struct timeval; /* silence warning */ struct timezone; /* silence warning */ #ifdef HAVE_SYS_TIMERS_H #include #endif #include #ifdef ISC_PLATFORM_NEEDTIMESPEC #include /* For time_t */ struct timespec { time_t tv_sec; /* seconds */ long tv_nsec; /* nanoseconds */ }; #endif #ifndef HAVE_MEMMOVE #define memmove(a,b,c) bcopy(b,a,c) #endif #undef WANT_IRS_GR #undef WANT_IRS_NIS #undef WANT_IRS_PW #undef BSD_COMP #undef HAVE_POLL #undef HAVE_MD5 #undef SOLARIS2 #define DO_PTHREADS 1 #define GETGROUPLIST_ARGS const char *name, gid_t basegid, gid_t *groups, int *ngroups #define GETNETBYADDR_ADDR_T unsigned long int #define SETPWENT_VOID 1 #undef SETGRENT_VOID #define NET_R_ARGS char *buf, size_t buflen, struct netent **answerp, int *h_errnop #define NET_R_BAD ERANGE #define NET_R_COPY buf, buflen #define NET_R_COPY_ARGS char *buf, size_t buflen #define NET_R_END_RESULT(x) /*empty*/ #define NET_R_END_RETURN void #undef NET_R_ENT_ARGS /*empty*/ #define NET_R_OK 0 #define NET_R_RETURN int #undef NET_R_SET_RESULT /*empty*/ #define NET_R_SETANSWER 1 #define NET_R_SET_RETURN void #undef NETENT_DATA #define GROUP_R_SET_RETURN void #undef GROUP_R_SET_RESULT /*empty*/ #define GROUP_R_END_RETURN void #define GROUP_R_END_RESULT(x) /*empty*/ #define GROUP_R_ENT_ARGS void #define HOST_R_ARGS char *buf, size_t buflen, struct hostent **answerp, int *h_errnop #define HOST_R_BAD ERANGE #define HOST_R_COPY buf, buflen #define HOST_R_COPY_ARGS char *buf, int buflen #define HOST_R_END_RESULT(x) /*empty*/ #define HOST_R_END_RETURN void #undef HOST_R_ENT_ARGS /*empty*/ #define HOST_R_ERRNO *h_errnop = h_errno #define HOST_R_OK 0 #define HOST_R_RETURN int #define HOST_R_SETANSWER 1 #undef HOST_R_SET_RESULT #define HOST_R_SET_RETURN void #undef HOSTENT_DATA #define NGR_R_ARGS char *buf, int buflen #define NGR_R_BAD (0) #define NGR_R_COPY buf, buflen #define NGR_R_COPY_ARGS NGR_R_ARGS +#define NGR_R_CONST #define NGR_R_END_RESULT(x) /*empty*/ #define NGR_R_END_RETURN void -#undef NGR_R_ENT_ARGS /*empty*/ +#undef NGR_R_END_ARGS /*empty*/ #define NGR_R_OK 1 #define NGR_R_RETURN int +#define NGR_R_SET_CONST const #undef NGR_R_SET_RESULT /*empty*/ #define NGR_R_SET_RETURN void +#undef NGR_R_SET_ARGS + +#if !defined(NGR_R_SET_ARGS) && defined(NGR_R_END_ARGS) +#define NGR_R_SET_ARGS NGR_R_END_ARGS +#endif #define PROTO_R_ARGS char *buf, size_t buflen, struct protoent **answerp #define PROTO_R_BAD ERANGE #define PROTO_R_COPY buf, buflen #define PROTO_R_COPY_ARGS char *buf, size_t buflen #define PROTO_R_END_RESULT(x) /*empty*/ #define PROTO_R_END_RETURN void #undef PROTO_R_ENT_ARGS /*empty*/ #undef PROTO_R_ENT_UNUSED #define PROTO_R_OK 0 #define PROTO_R_SETANSWER 1 #define PROTO_R_RETURN int #undef PROTO_R_SET_RESULT #define PROTO_R_SET_RETURN void #undef PROTOENT_DATA #define PASS_R_END_RESULT(x) /*empty*/ #define PASS_R_END_RETURN void #undef PASS_R_ENT_ARGS #undef PASS_R_SET_RESULT /*empty*/ #define PASS_R_SET_RETURN void #define SERV_R_ARGS char *buf, size_t buflen, struct servent **answerp #define SERV_R_BAD ERANGE #define SERV_R_COPY buf, buflen #define SERV_R_COPY_ARGS char *buf, size_t buflen #define SERV_R_END_RESULT(x) /*empty*/ #define SERV_R_END_RETURN void #undef SERV_R_ENT_ARGS /*empty*/ #undef SERV_R_ENT_UNUSED /*empty*/ #define SERV_R_OK (0) #define SERV_R_SETANSWER 1 #define SERV_R_RETURN int #undef SERV_R_SET_RESULT #define SERV_R_SET_RETURN void #define DE_CONST(konst, var) \ do { \ union { const void *k; void *v; } _u; \ _u.k = konst; \ var = _u.v; \ } while (0) #define UNUSED(x) (x) = (x) #undef NEED_SOLARIS_BITTYPES #define ISC_SOCKLEN_T socklen_t #ifdef __GNUC__ #define ISC_FORMAT_PRINTF(fmt, args) \ __attribute__((__format__(__printf__, fmt, args))) #else #define ISC_FORMAT_PRINTF(fmt, args) #endif /* Pull in host order macros when _XOPEN_SOURCE_EXTENDED is defined. */ #if defined(__hpux) && defined(_XOPEN_SOURCE_EXTENDED) #include #endif #endif /*! \file */ Index: head/lib/bind/config.h =================================================================== --- head/lib/bind/config.h (revision 186462) +++ head/lib/bind/config.h (revision 186463) @@ -1,316 +1,335 @@ /* $FreeBSD$ */ /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ /* * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ /* $Id: acconfig.h,v 1.44.18.5 2005/04/29 00:15:20 marka Exp $ */ /*! \file */ /*** *** This file is not to be included by any public header files, because *** it does not get installed. ***/ /** define to `int' if doesn't define. */ /* #undef ssize_t */ /** define on DEC OSF to enable 4.4BSD style sa_len support */ /* #undef _SOCKADDR_LEN */ /** define if your system needs pthread_init() before using pthreads */ /* #undef NEED_PTHREAD_INIT */ /** define if your system has sigwait() */ #define HAVE_SIGWAIT 1 /** define if sigwait() is the UnixWare flavor */ /* #undef HAVE_UNIXWARE_SIGWAIT */ /** define on Solaris to get sigwait() to work using pthreads semantics */ /* #undef _POSIX_PTHREAD_SEMANTICS */ /** define if LinuxThreads is in use */ /* #undef HAVE_LINUXTHREADS */ /** define if sysconf() is available */ #define HAVE_SYSCONF 1 /** define if sysctlbyname() is available */ #define HAVE_SYSCTLBYNAME 1 /** define if catgets() is available */ #define HAVE_CATGETS 1 /** define if getifaddrs() exists */ #define HAVE_GETIFADDRS 1 /** define if you have the NET_RT_IFLIST sysctl variable and sys/sysctl.h */ #define HAVE_IFLIST_SYSCTL 1 /** define if chroot() is available */ #define HAVE_CHROOT 1 /** define if tzset() is available */ #define HAVE_TZSET 1 /** define if struct addrinfo exists */ #define HAVE_ADDRINFO 1 /** define if getaddrinfo() exists */ #define HAVE_GETADDRINFO 1 /** define if gai_strerror() exists */ #define HAVE_GAISTRERROR 1 /** define if arc4random() exists */ #define HAVE_ARC4RANDOM 1 /** * define if pthread_setconcurrency() should be called to tell the * OS how many threads we might want to run. */ /* #undef CALL_PTHREAD_SETCONCURRENCY */ /** define if IPv6 is not disabled */ /* #undef WANT_IPV6 */ /** define if flockfile() is available */ #define HAVE_FLOCKFILE 1 /** define if getc_unlocked() is available */ #define HAVE_GETCUNLOCKED 1 /** Shut up warnings about sputaux in stdio.h on BSD/OS pre-4.1 */ /* #undef SHUTUP_SPUTAUX */ #ifdef SHUTUP_SPUTAUX struct __sFILE; extern __inline int __sputaux(int _c, struct __sFILE *_p); #endif /** Shut up warnings about missing sigwait prototype on BSD/OS 4.0* */ /* #undef SHUTUP_SIGWAIT */ #ifdef SHUTUP_SIGWAIT int sigwait(const unsigned int *set, int *sig); #endif /** Shut up warnings from gcc -Wcast-qual on BSD/OS 4.1. */ /* #undef SHUTUP_STDARG_CAST */ #if defined(SHUTUP_STDARG_CAST) && defined(__GNUC__) #include /** Grr. Must be included *every time*. */ /** * The silly continuation line is to keep configure from * commenting out the #undef. */ #undef \ va_start #define va_start(ap, last) \ do { \ union { const void *konst; long *var; } _u; \ _u.konst = &(last); \ ap = (va_list)(_u.var + __va_words(__typeof(last))); \ } while (0) #endif /** SHUTUP_STDARG_CAST && __GNUC__ */ /** define if the system has a random number generating device */ #define PATH_RANDOMDEV "/dev/random" /** define if pthread_attr_getstacksize() is available */ #define HAVE_PTHREAD_ATTR_GETSTACKSIZE 1 /** define if pthread_attr_setstacksize() is available */ #define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1 /** define if you have strerror in the C library. */ #define HAVE_STRERROR 1 /** Define if you are running under Compaq TruCluster. */ /* #undef HAVE_TRUCLUSTER */ /* Define if OpenSSL includes DSA support */ #define HAVE_OPENSSL_DSA 1 /* Define to the length type used by the socket API (socklen_t, size_t, int). */ #define ISC_SOCKADDR_LEN_T socklen_t /* Define if threads need PTHREAD_SCOPE_SYSTEM */ /* #undef NEED_PTHREAD_SCOPE_SYSTEM */ /* Define if recvmsg() does not meet all of the BSD socket API specifications. */ /* #undef BROKEN_RECVMSG */ /* Define if you cannot bind() before connect() for TCP sockets. */ /* #undef BROKEN_TCP_BIND_BEFORE_CONNECT */ +/* Solaris hack to get select_large_fdset. */ +/* #undef FD_SETSIZE */ + +/* Define to 1 if you have the `capset' function. */ +/* #undef HAVE_CAPSET */ + /* Define to 1 if you have the header file. */ /* #undef HAVE_DLFCN_H */ /* Define to 1 if you have the header file. */ #define HAVE_FCNTL_H 1 /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 /* Define to 1 if you have the `c' library (-lc). */ /* #undef HAVE_LIBC */ /* Define to 1 if you have the `c_r' library (-lc_r). */ /* #undef HAVE_LIBC_R */ /* Define to 1 if you have the `nsl' library (-lnsl). */ /* #undef HAVE_LIBNSL */ /* Define to 1 if you have the `pthread' library (-lpthread). */ /* #undef HAVE_LIBPTHREAD */ /* Define to 1 if you have the `scf' library (-lscf). */ /* #undef HAVE_LIBSCF */ /* Define to 1 if you have the `socket' library (-lsocket). */ /* #undef HAVE_LIBSOCKET */ /* Define to 1 if you have the `thr' library (-lthr). */ /* #undef HAVE_LIBTHR */ /* Define to 1 if you have the header file. */ /* #undef HAVE_LINUX_CAPABILITY_H */ /* Define to 1 if you have the header file. */ #define HAVE_LOCALE_H 1 /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_NET_IF6_H */ /* Define to 1 if you have the `setlocale' function. */ #define HAVE_SETLOCALE 1 /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 /* Define to 1 if you have the header file. */ #define HAVE_STDLIB_H 1 /* Define to 1 if you have the header file. */ #define HAVE_STRINGS_H 1 /* Define to 1 if you have the header file. */ #define HAVE_STRING_H 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_CAPABILITY_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_DEVPOLL_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_DYNTUNE_H */ + /* Define to 1 if you have the header file. */ #define HAVE_SYS_PARAM_H 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_PRCTL_H */ /* Define to 1 if you have the header file. */ #define HAVE_SYS_SELECT_H 1 /* Define to 1 if you have the header file. */ #define HAVE_SYS_SOCKIO_H 1 /* Define to 1 if you have the header file. */ #define HAVE_SYS_STAT_H 1 /* Define to 1 if you have the header file. */ #define HAVE_SYS_SYSCTL_H 1 /* Define to 1 if you have the header file. */ #define HAVE_SYS_TIME_H 1 /* Define to 1 if you have the header file. */ #define HAVE_SYS_TYPES_H 1 /* Define to 1 if you have the header file. */ #define HAVE_SYS_UN_H 1 /* Define if running under Compaq TruCluster */ /* #undef HAVE_TRUCLUSTER */ /* Define to 1 if you have the header file. */ #define HAVE_UNISTD_H 1 /* Defined if extern char *optarg is not declared. */ /* #undef NEED_OPTARG */ /* Define if connect does not honour the permission on the UNIX domain socket. */ /* #undef NEED_SECURE_DIRECTORY */ /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "" /* Define to the full name of this package. */ #define PACKAGE_NAME "" /* Define to the full name and version of this package. */ #define PACKAGE_STRING "" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "" /* Define to the version of this package. */ #define PACKAGE_VERSION "" /* Sets which flag to pass to open/fcntl to make non-blocking (O_NDELAY/O_NONBLOCK). */ #define PORT_NONBLOCK O_NONBLOCK /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Define to 1 if you can safely include both and . */ #define TIME_WITH_SYS_TIME 1 /* Defined if you need to use ioctl(FIONBIO) instead a fcntl call to make non-blocking. */ /* #undef USE_FIONBIO_IOCTL */ /* define if idnkit support is to be included. */ /* #undef WITH_IDN */ /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ #if defined __BIG_ENDIAN__ # define WORDS_BIGENDIAN 1 #elif ! defined __LITTLE_ENDIAN__ /* # undef WORDS_BIGENDIAN */ #endif /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ #ifndef __cplusplus -#define inline +#define inline /**/ #endif /* Define to `unsigned int' if does not define. */ /* #undef size_t */ /* Define to `int' if does not define. */ /* #undef ssize_t */ /* Define to `unsigned long' if does not define. */ /* #undef uintptr_t */ + +/* Define to empty if the keyword `volatile' does not work. Warning: valid + code using `volatile' can become incorrect without. Disable with care. */ +/* #undef volatile */ Index: head/lib/bind/isc/Makefile =================================================================== --- head/lib/bind/isc/Makefile (revision 186462) +++ head/lib/bind/isc/Makefile (revision 186463) @@ -1,133 +1,134 @@ # $FreeBSD$ .include BIND_DIR= ${.CURDIR}/../../../contrib/bind9 LIB_BIND_REL= .. LIB_BIND_DIR= ${.CURDIR}/${LIB_BIND_REL} SRCDIR= ${BIND_DIR}/lib/isc .include "${LIB_BIND_DIR}/config.mk" LIB= isc .PATH: ${SRCDIR}/unix SRCS+= app.c dir.c entropy.c \ errno2result.c file.c fsaccess.c \ interfaceiter.c keyboard.c net.c \ os.c resource.c socket.c stdio.c \ stdtime.c strerror.c syslog.c time.c \ .PATH: ${SRCDIR}/nls SRCS+= msgcat.c \ .PATH: ${SRCDIR}/pthreads SRCS+= condition.c mutex.c \ thread.c .PATH: ${SRCDIR} SRCS+= inet_pton.c \ assertions.c base64.c bitstring.c buffer.c \ bufferlist.c commandline.c error.c event.c \ hash.c heap.c hex.c hmacmd5.c hmacsha.c \ lex.c lfsr.c lib.c log.c md5.c \ mem.c mutexblock.c netaddr.c netscope.c ondestroy.c \ - parseint.c print.c quota.c random.c \ + parseint.c portset.c print.c quota.c random.c \ ratelimiter.c refcount.c region.c result.c rwlock.c \ serial.c sha1.c sha2.c sockaddr.c string.c strtoul.c \ symtab.c task.c taskpool.c timer.c version.c CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/pthreads/include CFLAGS+= -I${SRCDIR}/include -I${.CURDIR} CFLAGS+= -I${SRCDIR}/${ISC_ATOMIC_ARCH}/include DPADD= ${PTHREAD_DPADD} LDADD= ${PTHREAD_LDADD} .if ${MK_BIND_LIBS} != "no" INCS= ${SRCDIR}/include/isc/app.h \ ${SRCDIR}/include/isc/assertions.h \ ${SRCDIR}/include/isc/base64.h \ ${SRCDIR}/include/isc/bitstring.h \ ${SRCDIR}/include/isc/boolean.h \ ${SRCDIR}/include/isc/buffer.h \ ${SRCDIR}/include/isc/bufferlist.h \ ${SRCDIR}/include/isc/commandline.h \ ${SRCDIR}/include/isc/entropy.h \ ${SRCDIR}/include/isc/error.h \ ${SRCDIR}/include/isc/event.h \ ${SRCDIR}/include/isc/eventclass.h \ ${SRCDIR}/include/isc/file.h \ ${SRCDIR}/include/isc/formatcheck.h \ ${SRCDIR}/include/isc/fsaccess.h \ ${SRCDIR}/include/isc/hash.h \ ${SRCDIR}/include/isc/heap.h \ ${SRCDIR}/include/isc/hex.h \ ${SRCDIR}/include/isc/hmacmd5.h \ ${SRCDIR}/include/isc/hmacsha.h \ ${SRCDIR}/include/isc/interfaceiter.h \ ${SRCDIR}/include/isc/ipv6.h \ ${SRCDIR}/include/isc/lang.h \ ${SRCDIR}/include/isc/lex.h \ ${SRCDIR}/include/isc/lfsr.h \ ${SRCDIR}/include/isc/lib.h \ ${SRCDIR}/include/isc/list.h \ ${SRCDIR}/include/isc/log.h \ ${SRCDIR}/include/isc/magic.h \ ${SRCDIR}/include/isc/md5.h \ ${SRCDIR}/include/isc/mem.h \ ${SRCDIR}/include/isc/msgcat.h \ ${SRCDIR}/include/isc/msgs.h \ ${SRCDIR}/include/isc/mutexblock.h \ ${SRCDIR}/include/isc/netaddr.h \ ${SRCDIR}/include/isc/netscope.h \ ${SRCDIR}/include/isc/ondestroy.h \ ${SRCDIR}/include/isc/os.h \ ${SRCDIR}/include/isc/parseint.h \ + ${SRCDIR}/include/isc/portset.h \ ${SRCDIR}/include/isc/print.h \ ${SRCDIR}/include/isc/quota.h \ ${SRCDIR}/include/isc/random.h \ ${SRCDIR}/include/isc/ratelimiter.h \ ${SRCDIR}/include/isc/refcount.h \ ${SRCDIR}/include/isc/region.h \ ${SRCDIR}/include/isc/resource.h \ ${SRCDIR}/include/isc/result.h \ ${SRCDIR}/include/isc/resultclass.h \ ${SRCDIR}/include/isc/rwlock.h \ ${SRCDIR}/include/isc/serial.h \ ${SRCDIR}/include/isc/sha1.h \ ${SRCDIR}/include/isc/sha2.h \ ${SRCDIR}/include/isc/sockaddr.h \ ${SRCDIR}/include/isc/socket.h \ ${SRCDIR}/include/isc/stdio.h \ ${SRCDIR}/include/isc/stdlib.h \ ${SRCDIR}/include/isc/string.h \ ${SRCDIR}/include/isc/symtab.h \ ${SRCDIR}/include/isc/task.h \ ${SRCDIR}/include/isc/taskpool.h \ ${SRCDIR}/include/isc/timer.h \ ${SRCDIR}/include/isc/types.h \ ${SRCDIR}/include/isc/util.h \ ${SRCDIR}/include/isc/version.h \ ${SRCDIR}/pthreads/include/isc/condition.h \ ${SRCDIR}/pthreads/include/isc/mutex.h \ ${SRCDIR}/pthreads/include/isc/once.h \ ${SRCDIR}/pthreads/include/isc/thread.h \ ${SRCDIR}/unix/include/isc/dir.h \ ${SRCDIR}/unix/include/isc/int.h \ ${SRCDIR}/unix/include/isc/keyboard.h \ ${SRCDIR}/unix/include/isc/net.h \ ${SRCDIR}/unix/include/isc/netdb.h \ ${SRCDIR}/unix/include/isc/offset.h \ ${SRCDIR}/unix/include/isc/stat.h \ ${SRCDIR}/unix/include/isc/stdtime.h \ ${SRCDIR}/unix/include/isc/strerror.h \ ${SRCDIR}/unix/include/isc/syslog.h \ ${SRCDIR}/unix/include/isc/time.h \ ${SRCDIR}/${ISC_ATOMIC_ARCH}/include/isc/atomic.h \ isc/platform.h INCSDIR= ${INCLUDEDIR}/isc .endif .include Index: head/lib/bind/isc/isc/platform.h =================================================================== --- head/lib/bind/isc/isc/platform.h (revision 186462) +++ head/lib/bind/isc/isc/platform.h (revision 186463) @@ -1,308 +1,323 @@ /* $FreeBSD$ */ /* - * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: platform.h.in,v 1.34.18.9 2007/09/13 05:04:01 each Exp $ */ +/* $Id: platform.h.in,v 1.34.18.11 2008/06/24 23:45:55 tbox Exp $ */ #ifndef ISC_PLATFORM_H #define ISC_PLATFORM_H 1 /*! \file */ /***** ***** Platform-dependent defines. *****/ /* * Define if the platform has . */ #define ISC_PLATFORM_HAVESTRINGSH 1 /*** *** Network. ***/ /*! \brief * Define if this system needs the header file included * for full IPv6 support (pretty much only UnixWare). */ #undef ISC_PLATFORM_NEEDNETINETIN6H /*! \brief * Define if this system needs the header file included * to support in6_pkinfo (pretty much only BSD/OS). */ #undef ISC_PLATFORM_NEEDNETINET6IN6H /*! \brief * If sockaddrs on this system have an sa_len field, ISC_PLATFORM_HAVESALEN * will be defined. */ #define ISC_PLATFORM_HAVESALEN 1 /*! \brief * If this system has the IPv6 structure definitions, ISC_PLATFORM_HAVEIPV6 * will be defined. */ #define ISC_PLATFORM_HAVEIPV6 1 /*! \brief * If this system is missing in6addr_any, ISC_PLATFORM_NEEDIN6ADDRANY will * be defined. */ #undef ISC_PLATFORM_NEEDIN6ADDRANY /*! \brief * If this system is missing in6addr_loopback, ISC_PLATFORM_NEEDIN6ADDRLOOPBACK * will be defined. */ #undef ISC_PLATFORM_NEEDIN6ADDRLOOPBACK /*! \brief * If this system has in6_pktinfo, ISC_PLATFORM_HAVEIN6PKTINFO will be * defined. */ #define ISC_PLATFORM_HAVEIN6PKTINFO 1 /*! \brief * If this system has in_addr6, rather than in6_addr, ISC_PLATFORM_HAVEINADDR6 * will be defined. */ #undef ISC_PLATFORM_HAVEINADDR6 /*! \brief * If this system has sin6_scope_id, ISC_PLATFORM_HAVESCOPEID will be defined. */ #define ISC_PLATFORM_HAVESCOPEID 1 /*! \brief * If this system needs inet_ntop(), ISC_PLATFORM_NEEDNTOP will be defined. */ #undef ISC_PLATFORM_NEEDNTOP /*! \brief * If this system needs inet_pton(), ISC_PLATFORM_NEEDPTON will be defined. */ #undef ISC_PLATFORM_NEEDPTON /*! \brief * If this system needs inet_aton(), ISC_PLATFORM_NEEDATON will be defined. */ #undef ISC_PLATFORM_NEEDATON /*! \brief * If this system needs in_port_t, ISC_PLATFORM_NEEDPORTT will be defined. */ #undef ISC_PLATFORM_NEEDPORTT /*! \brief * If the system needs strsep(), ISC_PLATFORM_NEEDSTRSEP will be defined. */ #undef ISC_PLATFORM_NEEDSTRSEP /*! \brief * If the system needs strlcpy(), ISC_PLATFORM_NEEDSTRLCPY will be defined. */ #undef ISC_PLATFORM_NEEDSTRLCPY /*! \brief * If the system needs strlcat(), ISC_PLATFORM_NEEDSTRLCAT will be defined. */ #undef ISC_PLATFORM_NEEDSTRLCAT /*! \brief * Define either ISC_PLATFORM_BSD44MSGHDR or ISC_PLATFORM_BSD43MSGHDR. */ #define ISC_NET_BSD44MSGHDR 1 /*! \brief * Define if PTHREAD_ONCE_INIT should be surrounded by braces to * prevent compiler warnings (such as with gcc on Solaris 2.8). */ #undef ISC_PLATFORM_BRACEPTHREADONCEINIT /*! \brief * Define on some UnixWare systems to fix erroneous definitions of various * IN6_IS_ADDR_* macros. */ #undef ISC_PLATFORM_FIXIN6ISADDR +/*! \brief + * Define if the system supports kqueue multiplexing + */ +#define ISC_PLATFORM_HAVEKQUEUE 1 + +/*! \brief + * Define if the system supports epoll multiplexing + */ +#undef ISC_PLATFORM_HAVEEPOLL + +/*! \brief + * Define if the system supports /dev/poll multiplexing + */ +#undef ISC_PLATFORM_HAVEDEVPOLL + /* *** Printing. ***/ /*! \brief * If this system needs vsnprintf() and snprintf(), ISC_PLATFORM_NEEDVSNPRINTF * will be defined. */ #undef ISC_PLATFORM_NEEDVSNPRINTF /*! \brief * If this system need a modern sprintf() that returns (int) not (char*). */ #undef ISC_PLATFORM_NEEDSPRINTF /*! \brief * The printf format string modifier to use with isc_uint64_t values. */ #define ISC_PLATFORM_QUADFORMAT "ll" /*! \brief * Defined if we are using threads. */ #define ISC_PLATFORM_USETHREADS 1 /*! \brief * Defined if unistd.h does not cause fd_set to be delared. */ #undef ISC_PLATFORM_NEEDSYSSELECTH /*! \brief * Type used for resource limits. */ #define ISC_PLATFORM_RLIMITTYPE rlim_t /*! \brief * Define if your compiler supports "long long int". */ #define ISC_PLATFORM_HAVELONGLONG 1 /*! \brief * Define if the system has struct lifconf which is a extended struct ifconf * for IPv6. */ #undef ISC_PLATFORM_HAVELIFCONF /*! \brief * Define if the system has struct if_laddrconf which is a extended struct * ifconf for IPv6. */ #undef ISC_PLATFORM_HAVEIF_LADDRCONF /*! \brief * Define if the system has struct if_laddrreq. */ #undef ISC_PLATFORM_HAVEIF_LADDRREQ /*! \brief * Used to control how extern data is linked; needed for Win32 platforms. */ #undef ISC_PLATFORM_USEDECLSPEC /*! \brief * Define if the system supports if_nametoindex. */ #define ISC_PLATFORM_HAVEIFNAMETOINDEX 1 /*! \brief * Define if this system needs strtoul. */ #undef ISC_PLATFORM_NEEDSTRTOUL /*! \brief * Define if this system needs memmove. */ #undef ISC_PLATFORM_NEEDMEMMOVE /* * Define if the platform has . */ #define ISC_PLATFORM_HAVESYSUNH 1 /* * If the "xadd" operation is available on this architecture, - * ISC_PLATFORM_HAVEXADD will be defined. + * ISC_PLATFORM_HAVEXADD will be defined. */ #define ISC_PLATFORM_HAVEXADD 1 /* * If the "atomic swap" operation is available on this architecture, - * ISC_PLATFORM_HAVEATOMICSTORE" will be defined. + * ISC_PLATFORM_HAVEATOMICSTORE" will be defined. */ #define ISC_PLATFORM_HAVEATOMICSTORE 1 /* * If the "compare-and-exchange" operation is available on this architecture, - * ISC_PLATFORM_HAVECMPXCHG will be defined. + * ISC_PLATFORM_HAVECMPXCHG will be defined. */ #define ISC_PLATFORM_HAVECMPXCHG 1 /* * Define if gcc ASM extension is available */ #define ISC_PLATFORM_USEGCCASM 1 /* * Define if Tru64 style ASM syntax must be used. */ #undef ISC_PLATFORM_USEOSFASM /* * Define if the standard __asm function must be used. */ /* * Define if MacOS style of PPC assembly must be used. * e.g. "r6", not "6", for register six. */ #ifndef ISC_PLATFORM_USEDECLSPEC #define LIBISC_EXTERNAL_DATA #define LIBDNS_EXTERNAL_DATA #define LIBISCCC_EXTERNAL_DATA #define LIBISCCFG_EXTERNAL_DATA #define LIBBIND9_EXTERNAL_DATA #else /*! \brief ISC_PLATFORM_USEDECLSPEC */ #ifdef LIBISC_EXPORTS #define LIBISC_EXTERNAL_DATA __declspec(dllexport) #else #define LIBISC_EXTERNAL_DATA __declspec(dllimport) #endif #ifdef LIBDNS_EXPORTS #define LIBDNS_EXTERNAL_DATA __declspec(dllexport) #else #define LIBDNS_EXTERNAL_DATA __declspec(dllimport) #endif #ifdef LIBISCCC_EXPORTS #define LIBISCCC_EXTERNAL_DATA __declspec(dllexport) #else #define LIBISCCC_EXTERNAL_DATA __declspec(dllimport) #endif #ifdef LIBISCCFG_EXPORTS #define LIBISCCFG_EXTERNAL_DATA __declspec(dllexport) #else #define LIBISCCFG_EXTERNAL_DATA __declspec(dllimport) #endif #ifdef LIBBIND9_EXPORTS #define LIBBIND9_EXTERNAL_DATA __declspec(dllexport) #else #define LIBBIND9_EXTERNAL_DATA __declspec(dllimport) #endif #endif /*! \brief ISC_PLATFORM_USEDECLSPEC */ /* * Tell emacs to use C mode for this file. * * Local Variables: * mode: c * End: */ #endif /* ISC_PLATFORM_H */