Module Name: src
Committed By: christos
Date: Mon May 25 15:13:25 UTC 2020
Modified Files:
src/external/mpl/bind/dist/lib/ns: client.c
src/external/mpl/bind/dist/lib/ns/include/ns: client.h
Log Message:
Fix stats counters to be 32 bits on ILP32
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mpl/bind/dist/lib/ns/client.c
cvs rdiff -u -r1.8 -r1.9 \
src/external/mpl/bind/dist/lib/ns/include/ns/client.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mpl/bind/dist/lib/ns/client.c
diff -u src/external/mpl/bind/dist/lib/ns/client.c:1.9 src/external/mpl/bind/dist/lib/ns/client.c:1.10
--- src/external/mpl/bind/dist/lib/ns/client.c:1.9 Sun May 24 15:46:29 2020
+++ src/external/mpl/bind/dist/lib/ns/client.c Mon May 25 11:13:25 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: client.c,v 1.9 2020/05/24 19:46:29 christos Exp $ */
+/* $NetBSD: client.c,v 1.10 2020/05/25 15:13:25 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -128,7 +128,7 @@
* Number of tasks to be used by clients - those are used only when recursing
*/
-#if defined(_WIN32) && !defined(_WIN64)
+#if (defined(_WIN32) && !defined(_WIN64)) || !defined(_LP64)
LIBNS_EXTERNAL_DATA atomic_uint_fast32_t ns_client_requests;
#else /* if defined(_WIN32) && !defined(_WIN64) */
LIBNS_EXTERNAL_DATA atomic_uint_fast64_t ns_client_requests;
Index: src/external/mpl/bind/dist/lib/ns/include/ns/client.h
diff -u src/external/mpl/bind/dist/lib/ns/include/ns/client.h:1.8 src/external/mpl/bind/dist/lib/ns/include/ns/client.h:1.9
--- src/external/mpl/bind/dist/lib/ns/include/ns/client.h:1.8 Sun May 24 15:46:29 2020
+++ src/external/mpl/bind/dist/lib/ns/include/ns/client.h Mon May 25 11:13:25 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: client.h,v 1.8 2020/05/24 19:46:29 christos Exp $ */
+/* $NetBSD: client.h,v 1.9 2020/05/25 15:13:25 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -273,7 +273,7 @@ struct ns_client {
*/
#define NS_FAILCACHE_CD 0x01
-#if defined(_WIN32) && !defined(_WIN64)
+#if (defined(_WIN32) && !defined(_WIN64)) || !defined(_LP64)
LIBNS_EXTERNAL_DATA extern atomic_uint_fast32_t ns_client_requests;
#else /* if defined(_WIN32) && !defined(_WIN64) */
LIBNS_EXTERNAL_DATA extern atomic_uint_fast64_t ns_client_requests;