Replace ISC_DEPRECATED with ISC_ATTR_DEPRECATED

config.h.in

@@ -171,6 +171,9 @@
 /* Define to 1 if you have the `FIPS_mode' function. */
 #undef HAVE_FIPS_MODE
 
+/* Define to 1 if the system has the `deprecated' function attribute */
+#undef HAVE_FUNCTION_ATTRIBUTE_DEPRECATED
+
 /* Define to 1 if the system has the `noreturn' function attribute */
 #undef HAVE_FUNCTION_ATTRIBUTE_NORETURN
 

configure

@@ -13799,6 +13799,65 @@ fi
 
 
 
+
+
+    ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__((deprecated))" >&5
+$as_echo_n "checking for __attribute__((deprecated))... " >&6; }
+if ${ax_cv_have_func_attribute_deprecated+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+                    int foo( void ) __attribute__((deprecated("")));
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+                                      if test -s conftest.err; then :
+  ax_cv_have_func_attribute_deprecated=no
+else
+  ax_cv_have_func_attribute_deprecated=yes
+fi
+else
+  ax_cv_have_func_attribute_deprecated=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_func_attribute_deprecated" >&5
+$as_echo "$ax_cv_have_func_attribute_deprecated" >&6; }
+
+    if test yes = $ax_cv_have_func_attribute_deprecated; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_FUNCTION_ATTRIBUTE_DEPRECATED 1
+_ACEOF
+
+fi
+
+
+
+
 #
 # check for uname library routine
 #

configure.ac

@@ -440,6 +440,7 @@ AC_HEADER_TIME
 #
 
 AX_C_FUNCTION_ATTRIBUTE([noreturn])
+AX_C_FUNCTION_ATTRIBUTE([deprecated])
 
 #
 # check for uname library routine

lib/dns/include/dns/db.h

@@ -49,7 +49,6 @@
 #include <inttypes.h>
 #include <stdbool.h>
 
-#include <isc/deprecated.h>
 #include <isc/lang.h>
 #include <isc/magic.h>
 #include <isc/stats.h>
@@ -1618,17 +1617,17 @@ dns_db_setcachestats(dns_db_t *db, isc_stats_t *stats);
  *	dns_rdatasetstats_create(); otherwise NULL.
  */
 
+ISC_ATTR_DEPRECATED
 void
-dns_db_rpz_attach(dns_db_t *db, void *rpzs, uint8_t rpz_num)
-	ISC_DEPRECATED;
+dns_db_rpz_attach(dns_db_t *db, void *rpzs, uint8_t rpz_num);
 /*%<
  * Attach the response policy information for a view to a database for a
  * zone for the view.
  */
 
+ISC_ATTR_DEPRECATED
 isc_result_t
-dns_db_rpz_ready(dns_db_t *db)
-	ISC_DEPRECATED;
+dns_db_rpz_ready(dns_db_t *db);
 /*%<
  * Finish loading a response policy zone.
  */

lib/dns/include/dns/rpz.h

@@ -16,7 +16,6 @@
 #include <inttypes.h>
 #include <stdbool.h>
 
-#include <isc/deprecated.h>
 #include <isc/event.h>
 #include <isc/ht.h>
 #include <isc/lang.h>
@@ -394,15 +393,15 @@ dns_rpz_attach_rpzs(dns_rpz_zones_t *source, dns_rpz_zones_t **target);
 void
 dns_rpz_detach_rpzs(dns_rpz_zones_t **rpzsp);
 
+ISC_ATTR_DEPRECATED
 isc_result_t
 dns_rpz_beginload(dns_rpz_zones_t **load_rpzsp,
-		  dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num)
-	ISC_DEPRECATED;
+		  dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num);
 
+ISC_ATTR_DEPRECATED
 isc_result_t
 dns_rpz_ready(dns_rpz_zones_t *rpzs,
-	      dns_rpz_zones_t **load_rpzsp, dns_rpz_num_t rpz_num)
-	ISC_DEPRECATED;
+	      dns_rpz_zones_t **load_rpzsp, dns_rpz_num_t rpz_num);
 
 isc_result_t
 dns_rpz_add(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num,
@@ -424,4 +423,3 @@ dns_rpz_find_name(dns_rpz_zones_t *rpzs, dns_rpz_type_t rpz_type,
 ISC_LANG_ENDDECLS
 
 #endif /* DNS_RPZ_H */
-

lib/isc/include/isc/deprecated.h

@@ -1,22 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * 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 http://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-
-#ifndef ISC_DEPRECATED_H
-#define ISC_DEPRECATED_H
-
-#if (__GNUC__ + 0) > 3
-#define ISC_DEPRECATED                  __attribute__((deprecated))
-#else
-#define ISC_DEPRECATED                  /* none */
-#endif /* __GNUC__ > 3*/
-
-#endif

lib/isc/include/isc/platform.h.in

@@ -28,6 +28,11 @@
 #define ISC_ATTR_NORETURN
 #endif
 
+#if HAVE_FUNCTION_ATTRIBUTE_DEPRECATED
+#define ISC_ATTR_DEPRECATED __attribute__((__deprecated__))
+#else
+#define ISC_ATTR_DEPRECATED
+#endif
 
 /***
  *** Thread-Local Storage

lib/isc/include/isc/util.h

@@ -280,9 +280,4 @@ extern void mock_assert(const int result, const char* const expression,
  */
 #define ISC_ALIGN(x, a) (((x) + (a) - 1) & ~((typeof(x))(a)-1))
 
-/*%
- * Misc
- */
-#include <isc/deprecated.h>
-
 #endif /* ISC_UTIL_H */

lib/isc/win32/include/isc/platform.h.in

@@ -53,6 +53,7 @@ typedef uint32_t socklen_t;
  ***/
 
 #define ISC_ATTR_NORETURN __declspec(noreturn)
+#define ISC_ATTR_DEPRECATED
 
 /***
  *** Network.

util/copyrights

@@ -2180,7 +2180,6 @@
 ./lib/isc/include/isc/commandline.h		C	1999,2000,2001,2004,2005,2006,2007,2015,2016,2018
 ./lib/isc/include/isc/counter.h			C	2014,2016,2018
 ./lib/isc/include/isc/crc64.h			C	2013,2016,2018
-./lib/isc/include/isc/deprecated.h		C	2017,2018
 ./lib/isc/include/isc/errno.h			C	2016,2018
 ./lib/isc/include/isc/error.h			C	1998,1999,2000,2001,2004,2005,2006,2007,2009,2016,2017,2018
 ./lib/isc/include/isc/event.h			C	1998,1999,2000,2001,2002,2004,2005,2006,2007,2014,2016,2017,2018