[src/trunk]: src/external/bsd/bind/include fix merge botches

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/68f308b8c9c1
branches:  trunk
changeset: 812480:68f308b8c9c1
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Dec 17 04:10:03 2015 +0000

description:
fix merge botches

diffstat:

 external/bsd/bind/include/config.h       |  4 ++--
 external/bsd/bind/include/isc/platform.h |  4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (43 lines):

diff -r 09948ed8ec20 -r 68f308b8c9c1 external/bsd/bind/include/config.h
--- a/external/bsd/bind/include/config.h        Thu Dec 17 04:04:39 2015 +0000
+++ b/external/bsd/bind/include/config.h        Thu Dec 17 04:10:03 2015 +0000
@@ -354,7 +354,7 @@
 #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 @@
 /* #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
diff -r 09948ed8ec20 -r 68f308b8c9c1 external/bsd/bind/include/isc/platform.h
--- a/external/bsd/bind/include/isc/platform.h  Thu Dec 17 04:04:39 2015 +0000
+++ b/external/bsd/bind/include/isc/platform.h  Thu Dec 17 04:10:03 2015 +0000
@@ -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.