Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix merge botches

This commit is contained in:
christos 2015-12-17 04:10:03 +00:00
parent e63b12e88f
commit 975da4a027
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
external/bsd/bind/include/config.h vendored
View File

@ -354,7 +354,7 @@ int sigwait(const unsigned int *set, int *sig);
#define HAVE_NET_ROUTE_H 1
/* Define if your OpenSSL version supports AES */
/* #undef HAVE_OPENSSL_AES */
#define HAVE_OPENSSL_AES 1
/* Define if your OpenSSL version supports ECDSA. */
#define HAVE_OPENSSL_ECDSA 1
@ -381,7 +381,7 @@ int sigwait(const unsigned int *set, int *sig);
/* #undef HAVE_PTHREAD_YIELD_NP */
/* Define to 1 if you have the `readline' function. */
#define HAVE_READLINE 1
/* #undef HAVE_READLINE */
/* Define to 1 if you have the <regex.h> header file. */
#define HAVE_REGEX_H 1

4
external/bsd/bind/include/isc/platform.h vendored
View File

@ -291,7 +291,9 @@
* If the "xaddq" operation (64bit xadd) is available on this architecture,
* ISC_PLATFORM_HAVEXADDQ will be defined.
*/
#ifdef __HAVE_ATOMIC64_OPS
#define ISC_PLATFORM_HAVEXADDQ 1
#endif
/*
* If the "atomic swap" operation is available on this architecture,
@ -344,7 +346,7 @@
/*
* Defined if we are enabling SIT (Source Identity Token).
*/
#undef ISC_PLATFORM_USESIT
#define ISC_PLATFORM_USESIT 1
/***
*** Windows dll support.