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 03c84ae4979cbe24c8483cf6da4025b75739f3bb..abad670af892846aa188dd1713fb49a44c95ed68 100644 (file)
--- 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 702fd5aef3e4dd2ca4109752e9c99a216a0d8ac2..43026a01ef4e2b09961547fc79f0ac5835574b1d 100644 (file)
--- 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.
  */