From: Ondřej Surý <ondrej@sury.org>
Date: Tue, 5 Oct 2021 14:08:24 +0000 (+0200)
Subject: Remove duplicate DE_CONST macro
X-Git-Tag: v9.17.19~8^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f5985bae57e3a12dfac00bef5921ad7de87b1a5;p=thirdparty%2Fbind9.git

Remove duplicate DE_CONST macro

Both <isccc/util.h> and <isc/util.h> defined DE_CONST() macro.  As
<isccc/util.h> header includes <isc/util.h>, remove the macro from
<isccc/util.h> header.
---

diff --git a/lib/isccc/include/isccc/util.h b/lib/isccc/include/isccc/util.h
index 2768522f62c..800b8041ba0 100644
--- a/lib/isccc/include/isccc/util.h
+++ b/lib/isccc/include/isccc/util.h
@@ -204,22 +204,4 @@
 		(r).rend = (r).rstart + strlen(s); \
 	} while (0)
 
-/*%
- * Use this to remove the const qualifier of a variable to assign it to
- * a non-const variable or pass it as a non-const function argument ...
- * but only when you are sure it won't then be changed!
- * This is necessary to sometimes shut up some compilers
- * (as with gcc -Wcast-qual) when there is just no other good way to avoid the
- * situation.
- */
-#define DE_CONST(konst, var)           \
-	do {                           \
-		union {                \
-			const void *k; \
-			void *	    v; \
-		} _u;                  \
-		_u.k = konst;          \
-		var = _u.v;            \
-	} while (0)
-
 #endif /* ISCCC_UTIL_H */