Merge branch '700-windows-builds-failing' into 'master'

Resolve "Windows builds failing"

Closes #700

See merge request isc-projects/bind9!1073

lib/isc/mem.c

@@ -22,16 +22,17 @@
 #include <limits.h>
 
 #include <isc/bind9.h>
+#include <isc/hash.h>
 #include <isc/json.h>
 #include <isc/magic.h>
-#include <isc/hash.h>
 #include <isc/mem.h>
 #include <isc/msgs.h>
-#include <isc/once.h>
-#include <isc/refcount.h>
-#include <isc/string.h>
 #include <isc/mutex.h>
+#include <isc/once.h>
 #include <isc/print.h>
+#include <isc/refcount.h>
+#include <isc/strerr.h>
+#include <isc/string.h>
 #include <isc/util.h>
 #include <isc/xml.h>
 
@@ -734,8 +735,9 @@ default_memalloc(void *arg, size_t size) {
 
 	if (ptr == NULL && size != 0) {
 		char strbuf[ISC_STRERRORSIZE];
+		strerror_r(errno, strbuf, sizeof(strbuf));
 		isc_error_fatal(__FILE__, __LINE__, "malloc failed: %s",
-				strerror_r(errno, strbuf, sizeof(strbuf)));
+				strbuf);
 	}
 
 	return (ptr);

lib/isc/unix/ifiter_getifaddrs.c

@@ -20,6 +20,8 @@
 
 #include <ifaddrs.h>
 
+#include <isc/strerr.h>
+
 /*% Iterator Magic */
 #define IFITER_MAGIC		ISC_MAGIC('I', 'F', 'I', 'G')
 /*% Valid Iterator */

lib/isc/win32/socket.c

@@ -2531,7 +2531,7 @@ SocketIoThread(LPVOID ThreadContext) {
  */
 isc_result_t
 isc_socketmgr_create(isc_mem_t *mctx, isc_socketmgr_t **managerp) {
-	return (isc_socketmgr_create2(mctx, managerp, 0));
+	return (isc_socketmgr_create2(mctx, managerp, 0, 1));
 }
 
 isc_result_t

util/checklibs.sh

@@ -25,6 +25,21 @@ list=`git grep -l snprintf lib bin |
     echo "$list"
 }
 
+#
+# Check for missing #include <isc/strerr.h>
+#
+list=`git grep -wl strerror_r lib bin |
+      grep '\.c$' |
+      grep -vE -e '(lib/bind|lib/dns/rdata|lib/dns/gen.c)' \
+	       -e lib/isc/string.c \
+	       -e '(lib/isc/win32/time.c|dlzexternal/driver.c)' |
+      xargs grep -EL "(isc/strerr.h)" 2> /dev/null`
+[ -n "$list" ] && {
+    status=1
+    echo 'Missing #include <isc/strerr.h>:'
+    echo "$list"
+}
+
 #
 # Check for missing #include <inttypes.h>"
 #