From: Ondřej Surý <ondrej@isc.org>
Date: Fri, 20 Mar 2026 13:03:05 +0000 (+0100)
Subject: Move ISC_NONSTRING from util.h to attributes.h
X-Git-Tag: v9.21.21~20^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24951b703e7c51407974881a118871e766c54852;p=thirdparty%2Fbind9.git

Move ISC_NONSTRING from util.h to attributes.h

ISC_NONSTRING is a compiler attribute macro and belongs alongside
the other attribute definitions in attributes.h, not in util.h.
---

diff --git a/lib/isc/include/isc/attributes.h b/lib/isc/include/isc/attributes.h
index 03c84ae4979..abad670af89 100644
--- a/lib/isc/include/isc/attributes.h
+++ b/lib/isc/include/isc/attributes.h
@@ -118,3 +118,9 @@
 #else
 #define ISC_ATTR_NONNULL(...)
 #endif
+
+#if __GNUC__ >= 8 && !defined(__clang__)
+#define ISC_NONSTRING __attribute__((nonstring))
+#else /* if __GNUC__ >= 8 && !defined(__clang__) */
+#define ISC_NONSTRING
+#endif /* __GNUC__ */
diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h
index 702fd5aef3e..43026a01ef4 100644
--- a/lib/isc/include/isc/util.h
+++ b/lib/isc/include/isc/util.h
@@ -64,12 +64,6 @@
  */
 #define UNUSED(x) (void)(x)
 
-#if __GNUC__ >= 8 && !defined(__clang__)
-#define ISC_NONSTRING __attribute__((nonstring))
-#else /* if __GNUC__ >= 8 && !defined(__clang__) */
-#define ISC_NONSTRING
-#endif /* __GNUC__ */
-
 /*%
  * The opposite: silent warnings about stored values which are never read.
  */