From: Evan Hunt <each@isc.org>
Date: Wed, 26 Jun 2013 21:12:27 +0000 (-0700)
Subject: [master] fix compile bug with json but no xml
X-Git-Tag: v9.10.0a1~260
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=7aba1a9660630ab7d16792b7388d9b8f56d7bf0f;p=thirdparty%2Fbind9.git

[master] fix compile bug with json but no xml

3604.	[bug]		Fixed a compile-time error when building with
			JSON but not XML. [RT #33959]
---

diff --git a/CHANGES b/CHANGES
index 8ad18e7c9f2..b110a07cfb3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3604.	[bug]		Fixed a compile-time error when building with
+			JSON but not XML. [RT #33959]
+
 3603.	[bug]		Install <isc/stat.h>. [RT #33956]
 
 3602.	[contrib]	Added DLZ Perl module, allowing Perl scripts to
diff --git a/lib/isc/task.c b/lib/isc/task.c
index 2da2d7acf18..dbd88a141a2 100644
--- a/lib/isc/task.c
+++ b/lib/isc/task.c
@@ -89,7 +89,7 @@ typedef enum {
 	task_state_done
 } task_state_t;
 
-#if defined(HAVE_LIBXML2)
+#if defined(HAVE_LIBXML2) || defined(HAVE_JSON)
 static const char *statenames[] = {
 	"idle", "ready", "running", "done",
 };