From: Mark Andrews <marka@isc.org>
Date: Thu, 14 Mar 2013 00:12:27 +0000 (+1100)
Subject: make work without json
X-Git-Tag: v9.10.0a1~448^2~76
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cedd50b3b68078f3b22f8d7e254fb8708087847d;p=thirdparty%2Fbind9.git

make work without json
---

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 0dc52f690e6..b288a9cd5cc 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -5965,7 +5965,7 @@ isc__socket_getfd(isc_socket_t *socket0) {
 
 #ifdef BIND9
 
-#if defined(HAVE_LIBXML2) && defined(HAVE_JSON)
+#if defined(HAVE_LIBXML2) || defined(HAVE_JSON)
 static const char *
 _socktype(isc_sockettype_t type)
 {