Module Name: src
Committed By: christos
Date: Thu Dec 17 04:10:03 UTC 2015
Modified Files:
src/external/bsd/bind/include: config.h
src/external/bsd/bind/include/isc: platform.h
Log Message:
fix merge botches
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/bind/include/config.h
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/bind/include/isc/platform.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/include/config.h
diff -u src/external/bsd/bind/include/config.h:1.17 src/external/bsd/bind/include/config.h:1.18
--- src/external/bsd/bind/include/config.h:1.17 Wed Dec 16 23:00:21 2015
+++ src/external/bsd/bind/include/config.h Wed Dec 16 23:10:03 2015
@@ -354,7 +354,7 @@ int sigwait(const unsigned int *set, int
#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
/* #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
Index: src/external/bsd/bind/include/isc/platform.h
diff -u src/external/bsd/bind/include/isc/platform.h:1.20 src/external/bsd/bind/include/isc/platform.h:1.21
--- src/external/bsd/bind/include/isc/platform.h:1.20 Wed Dec 16 23:00:21 2015
+++ src/external/bsd/bind/include/isc/platform.h Wed Dec 16 23:10:03 2015
@@ -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.
