Module Name: src
Committed By: christos
Date: Mon Jan 27 15:40:36 UTC 2025
Modified Files:
src/external/mpl/bind/dist/lib/dns: qp.c zone.c
Log Message:
fix mistakes in previous
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/lib/dns/qp.c
cvs rdiff -u -r1.22 -r1.23 src/external/mpl/bind/dist/lib/dns/zone.c
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/dns/qp.c
diff -u src/external/mpl/bind/dist/lib/dns/qp.c:1.3 src/external/mpl/bind/dist/lib/dns/qp.c:1.4
--- src/external/mpl/bind/dist/lib/dns/qp.c:1.3 Sun Jan 26 21:16:05 2025
+++ src/external/mpl/bind/dist/lib/dns/qp.c Mon Jan 27 10:40:36 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: qp.c,v 1.3 2025/01/27 02:16:05 christos Exp $ */
+/* $NetBSD: qp.c,v 1.4 2025/01/27 15:40:36 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -68,7 +68,7 @@ static atomic_uint_fast64_t compact_time
static atomic_uint_fast64_t recycle_time;
static atomic_uint_fast64_t rollback_time;
#define ISC_QP_ADD(v, a) atomic_fetch_add_relaxed(&(v), (a))
-#define ISC_QP_GET(v) atomic_load_relaxed(v)
+#define ISC_QP_GET(v) atomic_load_relaxed(&(v))
#else
static uint64_t compact_time;
static uint64_t recycle_time;
Index: src/external/mpl/bind/dist/lib/dns/zone.c
diff -u src/external/mpl/bind/dist/lib/dns/zone.c:1.22 src/external/mpl/bind/dist/lib/dns/zone.c:1.23
--- src/external/mpl/bind/dist/lib/dns/zone.c:1.22 Sun Jan 26 21:16:05 2025
+++ src/external/mpl/bind/dist/lib/dns/zone.c Mon Jan 27 10:40:36 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: zone.c,v 1.22 2025/01/27 02:16:05 christos Exp $ */
+/* $NetBSD: zone.c,v 1.23 2025/01/27 15:40:36 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -533,7 +533,7 @@ struct dns_zone {
#ifdef _LP64
#define ISC_ZONE_GET(z, f) atomic_load_relaxed(&(z)->f)
#define ISC_ZONE_SET(z, f, o) atomic_fetch_or(&(z)->f, (o))
-#define DNS_ZONE_CLR(z, f, o) atomic_fetch_and(&(z)->f, ~(o))
+#define ISC_ZONE_CLR(z, f, o) atomic_fetch_and(&(z)->f, ~(o))
#else
#define ISC_ZONE_GET(z, f) \
({ \
