From 29c2e5248425c0a351e00663f08b49325beaf603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Thu, 10 Jun 2021 08:19:13 +0200 Subject: [PATCH] The isc/platform.h header has been completely removed The isc/platform.h header was left empty which things either already moved to config.h or to appropriate headers. This is just the final cleanup commit. --- bin/confgen/util.h | 1 - bin/dig/dig.c | 1 - bin/dnssec/dnssectool.c | 1 - bin/dnssec/dnssectool.h | 1 - bin/named/main.c | 1 - bin/named/server.c | 1 - bin/nsupdate/nsupdate.c | 1 - bin/rndc/util.h | 1 - bin/tests/system/pipelined/pipequeries.c | 1 - bin/tests/system/rsabigexponent/bigkey.c | 1 - configure.ac | 4 --- contrib/dlz/drivers/dlz_filesystem_driver.c | 1 - contrib/dlz/drivers/dlz_ldap_driver.c | 1 - contrib/dlz/drivers/dlz_mysql_driver.c | 1 - contrib/dlz/drivers/dlz_odbc_driver.c | 1 - contrib/dlz/drivers/dlz_postgres_driver.c | 1 - lib/.gitignore | 1 - lib/bind9/check.c | 1 - lib/dns/badcache.c | 1 - lib/dns/dst_api.c | 1 - lib/dns/gssapictx.c | 1 - lib/dns/include/dst/gssapi.h | 1 - lib/dns/openssl_link.c | 1 - lib/dns/rbt.c | 1 - lib/dns/rbtdb.c | 1 - lib/dns/resolver.c | 1 - lib/dns/update.c | 1 - lib/isc/Makefile.am | 1 - lib/isc/aes.c | 1 - lib/isc/app.c | 1 - lib/isc/assertions.c | 1 - lib/isc/backtrace.c | 1 - lib/isc/errno2result.c | 1 - lib/isc/file.c | 1 - lib/isc/hmac.c | 1 - lib/isc/include/isc/aes.h | 1 - lib/isc/include/isc/assertions.h | 1 - lib/isc/include/isc/bind9.h | 2 -- lib/isc/include/isc/commandline.h | 1 - lib/isc/include/isc/dir.h | 1 - lib/isc/include/isc/error.h | 1 - lib/isc/include/isc/hmac.h | 1 - lib/isc/include/isc/log.h | 1 - lib/isc/include/isc/md.h | 1 - lib/isc/include/isc/mem.h | 1 - lib/isc/include/isc/net.h | 1 - lib/isc/include/isc/once.h | 1 - lib/isc/include/isc/platform.h.in | 29 --------------------- lib/isc/include/isc/print.h | 1 - lib/isc/include/isc/refcount.h | 1 - lib/isc/include/isc/rwlock.h | 1 - lib/isc/include/isc/siphash.h | 1 - lib/isc/include/isc/string.h | 3 +-- lib/isc/log.c | 1 - lib/isc/pk11.c | 1 - lib/isc/random.c | 1 - lib/isc/resource.c | 1 - lib/isc/rwlock.c | 1 - lib/isc/socket.c | 1 - lib/isc/stats.c | 1 - lib/isc/task.c | 1 - lib/isc/tests/aes_test.c | 1 - lib/isc/tests/socket_test.c | 1 - lib/isc/tests/task_test.c | 1 - lib/isc/tests/timer_test.c | 1 - lib/isc/time.c | 1 - lib/isc/timer.c | 1 - lib/ns/client.c | 1 - lib/ns/hooks.c | 1 - lib/ns/include/ns/client.h | 1 - lib/ns/tests/plugin_test.c | 1 - util/check-includes.pl | 13 --------- util/copyrights | 1 - 73 files changed, 1 insertion(+), 118 deletions(-) delete mode 100644 lib/isc/include/isc/platform.h.in diff --git a/bin/confgen/util.h b/bin/confgen/util.h index 3426e70b7e..f5479438af 100644 --- a/bin/confgen/util.h +++ b/bin/confgen/util.h @@ -17,7 +17,6 @@ #include #include #include -#include #define NS_CONTROL_PORT 953 diff --git a/bin/dig/dig.c b/bin/dig/dig.c index 69cc7e0bf2..d8479ed407 100644 --- a/bin/dig/dig.c +++ b/bin/dig/dig.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c index 7239b5e4c7..5138a70062 100644 --- a/bin/dnssec/dnssectool.c +++ b/bin/dnssec/dnssectool.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/dnssec/dnssectool.h b/bin/dnssec/dnssectool.h index 04c81c1a56..d8825f2a7a 100644 --- a/bin/dnssec/dnssectool.h +++ b/bin/dnssec/dnssectool.h @@ -17,7 +17,6 @@ #include #include -#include #include #include diff --git a/bin/named/main.c b/bin/named/main.c index 51708cd975..4708cda535 100644 --- a/bin/named/main.c +++ b/bin/named/main.c @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/named/server.c b/bin/named/server.c index 10925c3c1c..7b70fe5c6b 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c index b3f4c16dba..16be26a7fa 100644 --- a/bin/nsupdate/nsupdate.c +++ b/bin/nsupdate/nsupdate.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/rndc/util.h b/bin/rndc/util.h index 3426e70b7e..f5479438af 100644 --- a/bin/rndc/util.h +++ b/bin/rndc/util.h @@ -17,7 +17,6 @@ #include #include #include -#include #define NS_CONTROL_PORT 953 diff --git a/bin/tests/system/pipelined/pipequeries.c b/bin/tests/system/pipelined/pipequeries.c index 51546bf7ad..c96afd16e7 100644 --- a/bin/tests/system/pipelined/pipequeries.c +++ b/bin/tests/system/pipelined/pipequeries.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/tests/system/rsabigexponent/bigkey.c b/bin/tests/system/rsabigexponent/bigkey.c index 5a143119bf..09ec9c75d3 100644 --- a/bin/tests/system/rsabigexponent/bigkey.c +++ b/bin/tests/system/rsabigexponent/bigkey.c @@ -14,7 +14,6 @@ #include #include -#include #include #include #include diff --git a/configure.ac b/configure.ac index 3fb21c1ea8..da41bca622 100644 --- a/configure.ac +++ b/configure.ac @@ -1620,10 +1620,6 @@ AC_CONFIG_FILES([doc/Makefile doc/man/Makefile doc/misc/Makefile]) -# Generated headers - -AC_CONFIG_FILES([lib/isc/include/isc/platform.h]) - # Unit Tests AC_CONFIG_FILES([lib/isc/tests/Makefile diff --git a/contrib/dlz/drivers/dlz_filesystem_driver.c b/contrib/dlz/drivers/dlz_filesystem_driver.c index 8ed1af1b33..76b9ca735a 100644 --- a/contrib/dlz/drivers/dlz_filesystem_driver.c +++ b/contrib/dlz/drivers/dlz_filesystem_driver.c @@ -50,7 +50,6 @@ #include #include -#include #include #include #include diff --git a/contrib/dlz/drivers/dlz_ldap_driver.c b/contrib/dlz/drivers/dlz_ldap_driver.c index ead2366805..637d8e8c97 100644 --- a/contrib/dlz/drivers/dlz_ldap_driver.c +++ b/contrib/dlz/drivers/dlz_ldap_driver.c @@ -48,7 +48,6 @@ #include #include -#include #include #include #include diff --git a/contrib/dlz/drivers/dlz_mysql_driver.c b/contrib/dlz/drivers/dlz_mysql_driver.c index 86a7f59e01..3b6d6cfa2d 100644 --- a/contrib/dlz/drivers/dlz_mysql_driver.c +++ b/contrib/dlz/drivers/dlz_mysql_driver.c @@ -48,7 +48,6 @@ #include #include -#include #include #include #include diff --git a/contrib/dlz/drivers/dlz_odbc_driver.c b/contrib/dlz/drivers/dlz_odbc_driver.c index d251721b3f..0a7cc96154 100644 --- a/contrib/dlz/drivers/dlz_odbc_driver.c +++ b/contrib/dlz/drivers/dlz_odbc_driver.c @@ -50,7 +50,6 @@ #include #include -#include #include #include #include diff --git a/contrib/dlz/drivers/dlz_postgres_driver.c b/contrib/dlz/drivers/dlz_postgres_driver.c index d5a46c5159..f67d843682 100644 --- a/contrib/dlz/drivers/dlz_postgres_driver.c +++ b/contrib/dlz/drivers/dlz_postgres_driver.c @@ -47,7 +47,6 @@ #include #include -#include #include #include #include diff --git a/lib/.gitignore b/lib/.gitignore index 9c93fd5f6b..c52800a76e 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -1,4 +1,3 @@ -platform.h netdb.h gen /unit-test-driver.sh diff --git a/lib/bind9/check.c b/lib/bind9/check.c index a67f68a356..c27de55476 100644 --- a/lib/bind9/check.c +++ b/lib/bind9/check.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/badcache.c b/lib/dns/badcache.c index aa09779b9e..cfe132caf4 100644 --- a/lib/dns/badcache.c +++ b/lib/dns/badcache.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c index de40f929a7..a510934d25 100644 --- a/lib/dns/dst_api.c +++ b/lib/dns/dst_api.c @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/gssapictx.c b/lib/dns/gssapictx.c index 1443ffef68..546bfa1a9d 100644 --- a/lib/dns/gssapictx.c +++ b/lib/dns/gssapictx.c @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/include/dst/gssapi.h b/lib/dns/include/dst/gssapi.h index 8ae8168ee2..86cad0e47a 100644 --- a/lib/dns/include/dst/gssapi.h +++ b/lib/dns/include/dst/gssapi.h @@ -18,7 +18,6 @@ #include #include -#include #include #include diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c index 1060fcc4ff..e6f8a5a409 100644 --- a/lib/dns/openssl_link.c +++ b/lib/dns/openssl_link.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c index a05fcd8609..4cfc1769af 100644 --- a/lib/dns/rbt.c +++ b/lib/dns/rbt.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c index d8a8fcb8e3..ad93de8d3a 100644 --- a/lib/dns/rbtdb.c +++ b/lib/dns/rbtdb.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index edb09e39d3..9772ae2628 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/update.c b/lib/dns/update.c index 71ef7dde46..5f1212b16b 100644 --- a/lib/dns/update.c +++ b/lib/dns/update.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/Makefile.am b/lib/isc/Makefile.am index 0689d351c3..cb57424bdf 100644 --- a/lib/isc/Makefile.am +++ b/lib/isc/Makefile.am @@ -66,7 +66,6 @@ libisc_la_HEADERS = \ include/isc/once.h \ include/isc/os.h \ include/isc/parseint.h \ - include/isc/platform.h \ include/isc/pool.h \ include/isc/portset.h \ include/isc/print.h \ diff --git a/lib/isc/aes.c b/lib/isc/aes.c index 2ad036184f..20067d6fa1 100644 --- a/lib/isc/aes.c +++ b/lib/isc/aes.c @@ -16,7 +16,6 @@ #include #include -#include #include #include #include diff --git a/lib/isc/app.c b/lib/isc/app.c index 50353705b2..1efadd0241 100644 --- a/lib/isc/app.c +++ b/lib/isc/app.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/assertions.c b/lib/isc/assertions.c index 0e89835a4d..b7cad929e2 100644 --- a/lib/isc/assertions.c +++ b/lib/isc/assertions.c @@ -16,7 +16,6 @@ #include #include -#include #include #include #include diff --git a/lib/isc/backtrace.c b/lib/isc/backtrace.c index 4fc3200bb0..d64950100b 100644 --- a/lib/isc/backtrace.c +++ b/lib/isc/backtrace.c @@ -18,7 +18,6 @@ #endif /* HAVE_BACKTRACE_SYMBOLS */ #include -#include #include #include #include diff --git a/lib/isc/errno2result.c b/lib/isc/errno2result.c index b7866f4b5c..623ac6dbe9 100644 --- a/lib/isc/errno2result.c +++ b/lib/isc/errno2result.c @@ -14,7 +14,6 @@ #include "errno2result.h" #include -#include #include #include #include diff --git a/lib/isc/file.c b/lib/isc/file.c index b3cf45534c..e68076f189 100644 --- a/lib/isc/file.c +++ b/lib/isc/file.c @@ -60,7 +60,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/hmac.c b/lib/isc/hmac.c index c300a306cb..b3940de52f 100644 --- a/lib/isc/hmac.c +++ b/lib/isc/hmac.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/include/isc/aes.h b/lib/isc/include/isc/aes.h index 42b6ab12e1..b8dbcb848f 100644 --- a/lib/isc/include/isc/aes.h +++ b/lib/isc/include/isc/aes.h @@ -15,7 +15,6 @@ #define ISC_AES_H 1 #include -#include #include #define ISC_AES128_KEYLENGTH 16U diff --git a/lib/isc/include/isc/assertions.h b/lib/isc/include/isc/assertions.h index 8afac643b2..5de20ce06c 100644 --- a/lib/isc/include/isc/assertions.h +++ b/lib/isc/include/isc/assertions.h @@ -17,7 +17,6 @@ #include #include #include -#include ISC_LANG_BEGINDECLS diff --git a/lib/isc/include/isc/bind9.h b/lib/isc/include/isc/bind9.h index dbc65c4987..be5a7df3a1 100644 --- a/lib/isc/include/isc/bind9.h +++ b/lib/isc/include/isc/bind9.h @@ -14,8 +14,6 @@ #include -#include - /* * This determines whether we are using the libisc/libdns libraries * in BIND9 or in some other application. For BIND9 (named and related diff --git a/lib/isc/include/isc/commandline.h b/lib/isc/include/isc/commandline.h index 223d81b1dc..778cb7aa20 100644 --- a/lib/isc/include/isc/commandline.h +++ b/lib/isc/include/isc/commandline.h @@ -17,7 +17,6 @@ #include #include -#include #include /*% Index into parent argv vector. */ diff --git a/lib/isc/include/isc/dir.h b/lib/isc/include/isc/dir.h index 8473f9bba8..2b3bf34fc2 100644 --- a/lib/isc/include/isc/dir.h +++ b/lib/isc/include/isc/dir.h @@ -17,7 +17,6 @@ #include #include -#include #include #include /* Required on some systems. */ diff --git a/lib/isc/include/isc/error.h b/lib/isc/include/isc/error.h index 775a8dde8c..218b3c2ca3 100644 --- a/lib/isc/include/isc/error.h +++ b/lib/isc/include/isc/error.h @@ -20,7 +20,6 @@ #include #include #include -#include ISC_LANG_BEGINDECLS diff --git a/lib/isc/include/isc/hmac.h b/lib/isc/include/isc/hmac.h index f41b07d6bc..ce1660d59f 100644 --- a/lib/isc/include/isc/hmac.h +++ b/lib/isc/include/isc/hmac.h @@ -18,7 +18,6 @@ #include #include -#include #include #include diff --git a/lib/isc/include/isc/log.h b/lib/isc/include/isc/log.h index 977a081c55..1f9e627570 100644 --- a/lib/isc/include/isc/log.h +++ b/lib/isc/include/isc/log.h @@ -21,7 +21,6 @@ #include #include -#include #include /*@{*/ diff --git a/lib/isc/include/isc/md.h b/lib/isc/include/isc/md.h index 163484fbae..3585a23128 100644 --- a/lib/isc/include/isc/md.h +++ b/lib/isc/include/isc/md.h @@ -17,7 +17,6 @@ #pragma once #include -#include #include #include diff --git a/lib/isc/include/isc/mem.h b/lib/isc/include/isc/mem.h index 404726d2fc..85973a755a 100644 --- a/lib/isc/include/isc/mem.h +++ b/lib/isc/include/isc/mem.h @@ -20,7 +20,6 @@ #include #include #include -#include #include ISC_LANG_BEGINDECLS diff --git a/lib/isc/include/isc/net.h b/lib/isc/include/isc/net.h index 96bedf632d..ec910e9d0c 100644 --- a/lib/isc/include/isc/net.h +++ b/lib/isc/include/isc/net.h @@ -67,7 +67,6 @@ #include #include -#include #include #include /* Contractual promise. */ diff --git a/lib/isc/include/isc/once.h b/lib/isc/include/isc/once.h index 3f9fe73a77..6bfa5cc1dc 100644 --- a/lib/isc/include/isc/once.h +++ b/lib/isc/include/isc/once.h @@ -16,7 +16,6 @@ #include -#include #include typedef pthread_once_t isc_once_t; diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in deleted file mode 100644 index ce32692f03..0000000000 --- a/lib/isc/include/isc/platform.h.in +++ /dev/null @@ -1,29 +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 https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -#ifndef ISC_PLATFORM_H -#define ISC_PLATFORM_H 1 - -/*! \file */ - -/***** - ***** Platform-dependent defines. - *****/ - -/* - * Tell emacs to use C mode for this file. - * - * Local Variables: - * mode: c - * End: - */ - -#endif /* ISC_PLATFORM_H */ diff --git a/lib/isc/include/isc/print.h b/lib/isc/include/isc/print.h index 96bdcd6353..73993c0ad4 100644 --- a/lib/isc/include/isc/print.h +++ b/lib/isc/include/isc/print.h @@ -20,7 +20,6 @@ #include /* Required for ISC_FORMAT_PRINTF() macro. */ #include -#include /*** *** Functions diff --git a/lib/isc/include/isc/refcount.h b/lib/isc/include/isc/refcount.h index 26f962b283..043ee4d0a4 100644 --- a/lib/isc/include/isc/refcount.h +++ b/lib/isc/include/isc/refcount.h @@ -18,7 +18,6 @@ #include #include #include -#include #include /*! \file isc/refcount.h diff --git a/lib/isc/include/isc/rwlock.h b/lib/isc/include/isc/rwlock.h index cbcb2dfb46..82f415a24d 100644 --- a/lib/isc/include/isc/rwlock.h +++ b/lib/isc/include/isc/rwlock.h @@ -19,7 +19,6 @@ #include #include #include -#include #include ISC_LANG_BEGINDECLS diff --git a/lib/isc/include/isc/siphash.h b/lib/isc/include/isc/siphash.h index 10957a9fdd..ff94057264 100644 --- a/lib/isc/include/isc/siphash.h +++ b/lib/isc/include/isc/siphash.h @@ -14,7 +14,6 @@ #pragma once #include -#include #include #define ISC_SIPHASH24_KEY_LENGTH 128 / 8 diff --git a/lib/isc/include/isc/string.h b/lib/isc/include/isc/string.h index 2c187ff38a..7f67ad2ef7 100644 --- a/lib/isc/include/isc/string.h +++ b/lib/isc/include/isc/string.h @@ -15,8 +15,7 @@ #include -#include "isc/lang.h" -#include "isc/platform.h" +#include ISC_LANG_BEGINDECLS diff --git a/lib/isc/log.c b/lib/isc/log.c index 916e34db3d..8f48f4718d 100644 --- a/lib/isc/log.c +++ b/lib/isc/log.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/pk11.c b/lib/isc/pk11.c index ba359482c3..5052406a6d 100644 --- a/lib/isc/pk11.c +++ b/lib/isc/pk11.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/random.c b/lib/isc/random.c index 7975d8581e..47c1f28cfd 100644 --- a/lib/isc/random.c +++ b/lib/isc/random.c @@ -34,7 +34,6 @@ #include #include -#include #include #include #include diff --git a/lib/isc/resource.c b/lib/isc/resource.c index 71143b7702..73145d14dc 100644 --- a/lib/isc/resource.c +++ b/lib/isc/resource.c @@ -15,7 +15,6 @@ #include /* Required on some systems for . */ #include -#include #include #include #include diff --git a/lib/isc/rwlock.c b/lib/isc/rwlock.c index 3441ce5c14..7984a63042 100644 --- a/lib/isc/rwlock.c +++ b/lib/isc/rwlock.c @@ -21,7 +21,6 @@ #include #include -#include #include #include #include diff --git a/lib/isc/socket.c b/lib/isc/socket.c index b086a07d8a..4b22d07fad 100644 --- a/lib/isc/socket.c +++ b/lib/isc/socket.c @@ -46,7 +46,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/stats.c b/lib/isc/stats.c index 6df4af6952..ab599b18af 100644 --- a/lib/isc/stats.c +++ b/lib/isc/stats.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/task.c b/lib/isc/task.c index 6cb7f7f0ea..2cfe953b33 100644 --- a/lib/isc/task.c +++ b/lib/isc/task.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/tests/aes_test.c b/lib/isc/tests/aes_test.c index 919c572786..1f3d18f567 100644 --- a/lib/isc/tests/aes_test.c +++ b/lib/isc/tests/aes_test.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/tests/socket_test.c b/lib/isc/tests/socket_test.c index 28a436b7d2..285e3c86ab 100644 --- a/lib/isc/tests/socket_test.c +++ b/lib/isc/tests/socket_test.c @@ -26,7 +26,6 @@ #include #include -#include #include #include #include diff --git a/lib/isc/tests/task_test.c b/lib/isc/tests/task_test.c index 5786997147..2be810d179 100644 --- a/lib/isc/tests/task_test.c +++ b/lib/isc/tests/task_test.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/tests/timer_test.c b/lib/isc/tests/timer_test.c index dc1223e318..717732010e 100644 --- a/lib/isc/tests/timer_test.c +++ b/lib/isc/tests/timer_test.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/time.c b/lib/isc/time.c index 9ef93879d6..727b399271 100644 --- a/lib/isc/time.c +++ b/lib/isc/time.c @@ -21,7 +21,6 @@ #include #include -#include #include #include #include diff --git a/lib/isc/timer.c b/lib/isc/timer.c index eb8a17cfc0..27025bf76f 100644 --- a/lib/isc/timer.c +++ b/lib/isc/timer.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/ns/client.c b/lib/ns/client.c index d5766b8bda..9fa9d865ec 100644 --- a/lib/ns/client.c +++ b/lib/ns/client.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/ns/hooks.c b/lib/ns/hooks.c index 095d6fa2bc..5b8d0ef8ca 100644 --- a/lib/ns/hooks.c +++ b/lib/ns/hooks.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/ns/include/ns/client.h b/lib/ns/include/ns/client.h index 690d1f114d..974e80dc1b 100644 --- a/lib/ns/include/ns/client.h +++ b/lib/ns/include/ns/client.h @@ -61,7 +61,6 @@ #include #include #include -#include #include #include diff --git a/lib/ns/tests/plugin_test.c b/lib/ns/tests/plugin_test.c index 0e6296c601..bb4fc95e00 100644 --- a/lib/ns/tests/plugin_test.c +++ b/lib/ns/tests/plugin_test.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include diff --git a/util/check-includes.pl b/util/check-includes.pl index 1e9f566ff0..2154d2f4e0 100644 --- a/util/check-includes.pl +++ b/util/check-includes.pl @@ -95,12 +95,6 @@ for (<>) { unless $file =~ m%isc/resultclass.h%; } - if (/$nocomment.*ISC_PLATFORM_/m && - ! m%^#include %m) { - print "$file has ISC_PLATFORM_ without \n" - unless $file =~ m%isc/platform.h%; - } - if ($file !~ m%isc/magic\.h$%) { print "$file has ISC_MAGIC_VALID without \n" if /$nocomment.*ISC_MAGIC_VALID/m && ! m%^#include %m; @@ -234,13 +228,6 @@ for (<>) { next; } - if ($elided eq "") { - if (! /^$nocomment.*ISC_PLATFORM_/m) { - print "$file has but no ISC_PLATFORM_\n"; - } - next; - } - if ($elided eq "") { if (! /^$nocomment.*ISC_MAGIC_VALID/m) { print "$file has but no ISC_MAGIC_VALID\n"; diff --git a/util/copyrights b/util/copyrights index e6cd90be9c..f982fbae20 100644 --- a/util/copyrights +++ b/util/copyrights @@ -1739,7 +1739,6 @@ ./lib/isc/include/isc/once.h C 1999,2000,2001,2004,2005,2007,2016,2018,2019,2020,2021 ./lib/isc/include/isc/os.h C 2000,2001,2004,2005,2006,2007,2016,2018,2019,2020,2021 ./lib/isc/include/isc/parseint.h C 2001,2002,2004,2005,2006,2007,2016,2018,2019,2020,2021 -./lib/isc/include/isc/platform.h.in C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2013,2014,2015,2016,2017,2018,2019,2020 ./lib/isc/include/isc/pool.h C 2013,2016,2018,2019,2020,2021 ./lib/isc/include/isc/portset.h C 2008,2009,2016,2018,2019,2020,2021 ./lib/isc/include/isc/print.h C 1999,2000,2001,2003,2004,2005,2006,2007,2014,2015,2016,2018,2019,2020,2021