From: Evan Hunt <each@isc.org>
Date: Fri, 5 Jan 2018 01:56:29 +0000 (-0800)
Subject: [v9_12_0_patch] unconditionally typedef summarystat_t for coverity
X-Git-Tag: v9.12.0rc2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=517505b0ce8c724ed9062be8a4fbc9b019b7610d;p=thirdparty%2Fbind9.git

[v9_12_0_patch] unconditionally typedef summarystat_t for coverity

(cherry picked from commit a0e66ef6dd8d1cfd4420be0ffd363d7c53dc794b)
(cherry picked from commit b1e6c5d922f3b49342460a1a5a584e558b475c1d)
---

diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index 54e8814c85c..e14e4597a1f 100644
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -2352,7 +2352,6 @@ isc_mem_references(isc_mem_t *ctx0) {
 	return (references);
 }
 
-#if defined(HAVE_LIBXML2) || defined(HAVE_JSON)
 typedef struct summarystat {
 	isc_uint64_t	total;
 	isc_uint64_t	inuse;
@@ -2360,7 +2359,6 @@ typedef struct summarystat {
 	isc_uint64_t	blocksize;
 	isc_uint64_t	contextsize;
 } summarystat_t;
-#endif
 
 #ifdef HAVE_LIBXML2
 #define TRY0(a) do { xmlrc = (a); if (xmlrc < 0) goto error; } while(0)