From: Tony Finch <fanf@isc.org>
Date: Fri, 16 Dec 2022 11:31:08 +0000 (+0000)
Subject: Deprecate <isc/deprecated.h>
X-Git-Tag: v9.19.11~63^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75f7a85a39c7f9a8a27a34ed341a346290606807;p=thirdparty%2Fbind9.git

Deprecate <isc/deprecated.h>

We refactor more freely these days.
---

diff --git a/CHANGES b/CHANGES
index b673261f552..270f9c7cb08 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+6100.	[cleanup]	Deprecate <isc/deprecated.h>, because obsolete
+			functions are now deleted instead of marked with
+			an attribute. [GL !7466]
+
 6099.	[performance]	Change the internal read-write lock to modified C-RW-WP
 			algorithm that is more reader-writer fair and has better
 			performance for our workloads. [GL #1609]
diff --git a/lib/isc/Makefile.am b/lib/isc/Makefile.am
index b532587cf2d..8bc44fc864c 100644
--- a/lib/isc/Makefile.am
+++ b/lib/isc/Makefile.am
@@ -21,7 +21,6 @@ libisc_la_HEADERS =			\
 	include/isc/condition.h		\
 	include/isc/counter.h		\
 	include/isc/crc64.h		\
-	include/isc/deprecated.h	\
 	include/isc/dir.h		\
 	include/isc/dnsstream.h		\
 	include/isc/endian.h		\
diff --git a/lib/isc/include/isc/deprecated.h b/lib/isc/include/isc/deprecated.h
deleted file mode 100644
index c83508d45fc..00000000000
--- a/lib/isc/include/isc/deprecated.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * SPDX-License-Identifier: MPL-2.0
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-#pragma once
-
-#if (__GNUC__ + 0) > 3
-#define ISC_DEPRECATED __attribute__((deprecated))
-#else		       /* if (__GNUC__ + 0) > 3 */
-#define ISC_DEPRECATED /* none */
-#endif		       /* __GNUC__ > 3*/
diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h
index 35d90501587..65835920b66 100644
--- a/lib/isc/include/isc/util.h
+++ b/lib/isc/include/isc/util.h
@@ -387,11 +387,6 @@ mock_assert(const int result, const char *const expression,
 #define ISC_ALIGN(x, a) (((x) + (a)-1) & ~((uintmax_t)(a)-1))
 #endif /* ifdef __GNUC__ */
 
-/*%
- * Misc
- */
-#include <isc/deprecated.h>
-
 /*%
  * Swap
  */