From: Mark Andrews <marka@isc.org>
Date: Fri, 22 Sep 2017 08:08:54 +0000 (+1000)
Subject: #include <isc/string.h> as it includes both <string.h> and <strings.h> if they both... 
X-Git-Tag: v9.12.0b1~145
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=6138c5a5e4a83bb006807d8aa0d260ca5b6191ee;p=thirdparty%2Fbind9.git

#include <isc/string.h> as it includes both <string.h> and <strings.h> if they both exist
---

diff --git a/lib/isc/safe.c b/lib/isc/safe.c
index f00479e2f40..aaf9cc93fe4 100644
--- a/lib/isc/safe.c
+++ b/lib/isc/safe.c
@@ -11,14 +11,11 @@
 #include <config.h>
 
 #include <isc/safe.h>
+#include <isc/string.h>
 #include <isc/util.h>
 
 #ifdef WIN32
 #include <windows.h>
-#elif HAVE_EXPLICIT_BZERO
-#include <strings.h>
-#else
-#include <string.h>
 #endif
 
 #ifdef _MSC_VER