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.

diff --git a/bin/confgen/util.h b/bin/confgen/util.h
index 3426e70b7ea00e0438d6f685d01c4de530e8983f..f5479438afa3a0daa4678ee9d214d4d6435ac6c1 100644 (file)
--- a/bin/confgen/util.h
+++ b/bin/confgen/util.h
@@ -17,7 +17,6 @@
 #include <isc/attributes.h>
 #include <isc/formatcheck.h>
 #include <isc/lang.h>
-#include <isc/platform.h>
 
 #define NS_CONTROL_PORT 953
 

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 69cc7e0bf256d35876cc4cd153e552d0cca4d7ef..d8479ed407e74e5a1744d32c1242e280956d2f59 100644 (file)
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -22,7 +22,6 @@
 #include <isc/dir.h>
 #include <isc/netaddr.h>
 #include <isc/parseint.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/string.h>
 #include <isc/task.h>

diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c
index 7239b5e4c7845204775efd3b0e7b6da147cd9ff8..5138a70062003a7b852343161f82d610c13c13dd 100644 (file)
--- a/bin/dnssec/dnssectool.c
+++ b/bin/dnssec/dnssectool.c
@@ -27,7 +27,6 @@
 #include <isc/heap.h>
 #include <isc/list.h>
 #include <isc/mem.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/string.h>
 #include <isc/time.h>

diff --git a/bin/dnssec/dnssectool.h b/bin/dnssec/dnssectool.h
index 04c81c1a561cacf1af21ed10bce1b367f5055bb8..d8825f2a7a86992e68d1d9407c7dde3c485727f6 100644 (file)
--- a/bin/dnssec/dnssectool.h
+++ b/bin/dnssec/dnssectool.h
@@ -17,7 +17,6 @@
 
 #include <isc/attributes.h>
 #include <isc/log.h>
-#include <isc/platform.h>
 #include <isc/stdtime.h>
 
 #include <dns/rdatastruct.h>

diff --git a/bin/named/main.c b/bin/named/main.c
index 51708cd975fbfdda22a6c196421e654cbfacc19e..4708cda535ed1cc6a83f576f47f1be469ecb8928 100644 (file)
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -35,7 +35,6 @@
 #include <isc/managers.h>
 #include <isc/netmgr.h>
 #include <isc/os.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/resource.h>
 #include <isc/stdio.h>

diff --git a/bin/named/server.c b/bin/named/server.c
index 10925c3c1c7c4a9058ea16d02a8f95164d81d969..7b70fe5c6bdbd11ffd1c5b47bbd00f76173a94b8 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -39,7 +39,6 @@
 #include <isc/meminfo.h>
 #include <isc/nonce.h>
 #include <isc/parseint.h>
-#include <isc/platform.h>
 #include <isc/portset.h>
 #include <isc/print.h>
 #include <isc/refcount.h>

diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index b3f4c16dbaa1cce19c10d9355919dd7c6a41d655..16be26a7facf110adf59d60fdb432dab1a279690 100644 (file)
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -33,7 +33,6 @@
 #include <isc/mem.h>
 #include <isc/nonce.h>
 #include <isc/parseint.h>
-#include <isc/platform.h>
 #include <isc/portset.h>
 #include <isc/print.h>
 #include <isc/random.h>

diff --git a/bin/rndc/util.h b/bin/rndc/util.h
index 3426e70b7ea00e0438d6f685d01c4de530e8983f..f5479438afa3a0daa4678ee9d214d4d6435ac6c1 100644 (file)
--- a/bin/rndc/util.h
+++ b/bin/rndc/util.h
@@ -17,7 +17,6 @@
 #include <isc/attributes.h>
 #include <isc/formatcheck.h>
 #include <isc/lang.h>
-#include <isc/platform.h>
 
 #define NS_CONTROL_PORT 953
 

diff --git a/bin/tests/system/pipelined/pipequeries.c b/bin/tests/system/pipelined/pipequeries.c
index 51546bf7ada4562a2c1add7a47d0cc57bf214b29..c96afd16e73a3b9c662fa6b6c5c11619ab5c96b4 100644 (file)
--- a/bin/tests/system/pipelined/pipequeries.c
+++ b/bin/tests/system/pipelined/pipequeries.c
@@ -24,7 +24,6 @@
 #include <isc/mem.h>
 #include <isc/net.h>
 #include <isc/parseint.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/sockaddr.h>
 #include <isc/socket.h>

diff --git a/bin/tests/system/rsabigexponent/bigkey.c b/bin/tests/system/rsabigexponent/bigkey.c
index 5a143119bf570154b5d54a18e78ca4cb38f52c67..09ec9c75d3c92c3b6e13cd6dd8bebcc36bd3c86e 100644 (file)
--- a/bin/tests/system/rsabigexponent/bigkey.c
+++ b/bin/tests/system/rsabigexponent/bigkey.c
@@ -14,7 +14,6 @@
 
 #include <isc/buffer.h>
 #include <isc/mem.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/region.h>
 #include <isc/stdio.h>

diff --git a/configure.ac b/configure.ac
index 3fb21c1ea83be15ddf5ca1c4c5c6bc9f71856c7f..da41bca622d98e7dcd88f3a03c7ccc81b3415e37 100644 (file)
--- 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 8ed1af1b330021774f557017fe7268a9a556a3d3..76b9ca735ab68b83366734bec93a49578a270ad3 100644 (file)
--- a/contrib/dlz/drivers/dlz_filesystem_driver.c
+++ b/contrib/dlz/drivers/dlz_filesystem_driver.c
@@ -50,7 +50,6 @@
 
 #include <isc/dir.h>
 #include <isc/mem.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/result.h>
 #include <isc/string.h>

diff --git a/contrib/dlz/drivers/dlz_ldap_driver.c b/contrib/dlz/drivers/dlz_ldap_driver.c
index ead2366805d5adc819e07693128bcc64f78ab3d4..637d8e8c97ce15b63ce324fcd3b82c19bf9a792a 100644 (file)
--- a/contrib/dlz/drivers/dlz_ldap_driver.c
+++ b/contrib/dlz/drivers/dlz_ldap_driver.c
@@ -48,7 +48,6 @@
 #include <string.h>
 
 #include <isc/mem.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/result.h>
 #include <isc/string.h>

diff --git a/contrib/dlz/drivers/dlz_mysql_driver.c b/contrib/dlz/drivers/dlz_mysql_driver.c
index 86a7f59e010476c2463c57eb6a30cdebc413b410..3b6d6cfa2d3727c8df885c6807a8968870c123c4 100644 (file)
--- a/contrib/dlz/drivers/dlz_mysql_driver.c
+++ b/contrib/dlz/drivers/dlz_mysql_driver.c
@@ -48,7 +48,6 @@
 #include <string.h>
 
 #include <isc/mem.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/result.h>
 #include <isc/string.h>

diff --git a/contrib/dlz/drivers/dlz_odbc_driver.c b/contrib/dlz/drivers/dlz_odbc_driver.c
index d251721b3f39b9bb568b0d0024ceee7645a88d4a..0a7cc961545c25a0051a4ff5d6f45981b5b6b3bd 100644 (file)
--- a/contrib/dlz/drivers/dlz_odbc_driver.c
+++ b/contrib/dlz/drivers/dlz_odbc_driver.c
@@ -50,7 +50,6 @@
 #include <string.h>
 
 #include <isc/mem.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/result.h>
 #include <isc/string.h>

diff --git a/contrib/dlz/drivers/dlz_postgres_driver.c b/contrib/dlz/drivers/dlz_postgres_driver.c
index d5a46c5159f2a930995f7dd29f001dc2ac4a1da1..f67d843682a224ba74d5aa98d92a4d52786da7ba 100644 (file)
--- a/contrib/dlz/drivers/dlz_postgres_driver.c
+++ b/contrib/dlz/drivers/dlz_postgres_driver.c
@@ -47,7 +47,6 @@
 #include <string.h>
 
 #include <isc/mem.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/result.h>
 #include <isc/string.h>

diff --git a/lib/.gitignore b/lib/.gitignore
index 9c93fd5f6b990c07a42708416eead783dd6a2c32..c52800a76eabe4f5c03cdf5011f0b91c347c7207 100644 (file)
--- 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 a67f68a3560ac7ba8cafbf93aa4641b97906fe17..c27de55476b8bd13fae0a05f6f03b251a600373d 100644 (file)
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -31,7 +31,6 @@
 #include <isc/mem.h>
 #include <isc/netaddr.h>
 #include <isc/parseint.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/region.h>
 #include <isc/result.h>

diff --git a/lib/dns/badcache.c b/lib/dns/badcache.c
index aa09779b9ef1b152aa54994fb65a91922993d874..cfe132caf4e1ac8e76780229e3c3cae004e8b460 100644 (file)
--- a/lib/dns/badcache.c
+++ b/lib/dns/badcache.c
@@ -19,7 +19,6 @@
 #include <isc/log.h>
 #include <isc/mem.h>
 #include <isc/mutex.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/rwlock.h>
 #include <isc/string.h>

diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c
index de40f929a7e7419aa94abf2939f7cad0094f5d18..a510934d2558d878ab8bcaaac6cf8b085f388ebd 100644 (file)
--- a/lib/dns/dst_api.c
+++ b/lib/dns/dst_api.c
@@ -37,7 +37,6 @@
 #include <isc/lex.h>
 #include <isc/mem.h>
 #include <isc/once.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/random.h>
 #include <isc/refcount.h>

diff --git a/lib/dns/gssapictx.c b/lib/dns/gssapictx.c
index 1443ffef68a6b71f690142025418827aa9d16efe..546bfa1a9d4ce0f701e7b03e3b62a45e89bb15fc 100644 (file)
--- a/lib/dns/gssapictx.c
+++ b/lib/dns/gssapictx.c
@@ -40,7 +40,6 @@
 #include <isc/lex.h>
 #include <isc/mem.h>
 #include <isc/once.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/random.h>
 #include <isc/string.h>

diff --git a/lib/dns/include/dst/gssapi.h b/lib/dns/include/dst/gssapi.h
index 8ae8168ee261064f91b63e5ad02eda2b3708c28c..86cad0e47a3964ad422c61c045a33945b1010a34 100644 (file)
--- a/lib/dns/include/dst/gssapi.h
+++ b/lib/dns/include/dst/gssapi.h
@@ -18,7 +18,6 @@
 
 #include <isc/formatcheck.h>
 #include <isc/lang.h>
-#include <isc/platform.h>
 #include <isc/types.h>
 
 #include <dns/types.h>

diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c
index 1060fcc4ff99dacd5af664c6edb39665d0da55de..e6f8a5a4099edd20a745502108b08afda2c820f5 100644 (file)
--- a/lib/dns/openssl_link.c
+++ b/lib/dns/openssl_link.c
@@ -26,7 +26,6 @@
 #include <isc/mem.h>
 #include <isc/mutex.h>
 #include <isc/mutexblock.h>
-#include <isc/platform.h>
 #include <isc/string.h>
 #include <isc/thread.h>
 #include <isc/tls.h>

diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c
index a05fcd86094c1f721e3c571a3609971d3c531cbc..4cfc1769af3b22ed77948ec10996fb8645b9e5b4 100644 (file)
--- a/lib/dns/rbt.c
+++ b/lib/dns/rbt.c
@@ -20,7 +20,6 @@
 #include <isc/hex.h>
 #include <isc/mem.h>
 #include <isc/once.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/refcount.h>
 #include <isc/socket.h>

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index d8a8fcb8e37df0cdb36b21c01b461c3dc78ae320..ad93de8d3a097feee57d456e13dce68eb113a2b2 100644 (file)
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -28,7 +28,6 @@
 #include <isc/mem.h>
 #include <isc/mutex.h>
 #include <isc/once.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/random.h>
 #include <isc/refcount.h>

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index edb09e39d30c6d01441f8aa66bea2449e22b4e95..9772ae2628ac4cb3973761157a5a23b279c899f2 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -18,7 +18,6 @@
 #include <isc/atomic.h>
 #include <isc/counter.h>
 #include <isc/log.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/random.h>
 #include <isc/refcount.h>

diff --git a/lib/dns/update.c b/lib/dns/update.c
index 71ef7dde467c77805988a5609c2f136260cc9edc..5f1212b16bf000acacc568bb72296d8b76aaed92 100644 (file)
--- a/lib/dns/update.c
+++ b/lib/dns/update.c
@@ -17,7 +17,6 @@
 #include <isc/magic.h>
 #include <isc/mem.h>
 #include <isc/netaddr.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/random.h>
 #include <isc/serial.h>

diff --git a/lib/isc/Makefile.am b/lib/isc/Makefile.am
index 0689d351c3d688d9470a18f872b9e3a82c48f01b..cb57424bdf300bdeb3cd7053edd94aca8843b738 100644 (file)
--- 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 2ad036184f65f62f982bd2efd1106609bb35d70a..20067d6fa1b57ac85f0ae4915e1233abedc67aa0 100644 (file)
--- a/lib/isc/aes.c
+++ b/lib/isc/aes.c
@@ -16,7 +16,6 @@
 
 #include <isc/aes.h>
 #include <isc/assertions.h>
-#include <isc/platform.h>
 #include <isc/string.h>
 #include <isc/types.h>
 #include <isc/util.h>

diff --git a/lib/isc/app.c b/lib/isc/app.c
index 50353705b2c76c5ae26b053c7289ef4c49e08eb1..1efadd0241ee03af6e919cef194e3ad3ae918aa7 100644 (file)
--- a/lib/isc/app.c
+++ b/lib/isc/app.c
@@ -28,7 +28,6 @@
 #include <isc/event.h>
 #include <isc/mem.h>
 #include <isc/mutex.h>
-#include <isc/platform.h>
 #include <isc/strerr.h>
 #include <isc/string.h>
 #include <isc/task.h>

diff --git a/lib/isc/assertions.c b/lib/isc/assertions.c
index 0e89835a4d268a4263eb7350439aba7803b08af5..b7cad929e288a78d4d7b023e52855895ebd892e1 100644 (file)
--- a/lib/isc/assertions.c
+++ b/lib/isc/assertions.c
@@ -16,7 +16,6 @@
 
 #include <isc/assertions.h>
 #include <isc/backtrace.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/result.h>
 #include <isc/strerr.h>

diff --git a/lib/isc/backtrace.c b/lib/isc/backtrace.c
index 4fc3200bb0813439745fcbd97fd3b05a040f6f19..d64950100bbef31626ef767c5c6f392aaea879ef 100644 (file)
--- a/lib/isc/backtrace.c
+++ b/lib/isc/backtrace.c
@@ -18,7 +18,6 @@
 #endif /* HAVE_BACKTRACE_SYMBOLS */
 
 #include <isc/backtrace.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/result.h>
 #include <isc/util.h>

diff --git a/lib/isc/errno2result.c b/lib/isc/errno2result.c
index b7866f4b5c9798654b44b18a4e68f48712e41a83..623ac6dbe9e181aad582114bd8ffb3981c5344a7 100644 (file)
--- a/lib/isc/errno2result.c
+++ b/lib/isc/errno2result.c
@@ -14,7 +14,6 @@
 #include "errno2result.h"
 #include <stdbool.h>
 
-#include <isc/platform.h>
 #include <isc/result.h>
 #include <isc/strerr.h>
 #include <isc/string.h>

diff --git a/lib/isc/file.c b/lib/isc/file.c
index b3cf45534ca1e1612b3c84e2e7760bb69c4fe6e0..e68076f1893db5cb8dd926d4acaa69c348716c89 100644 (file)
--- a/lib/isc/file.c
+++ b/lib/isc/file.c
@@ -60,7 +60,6 @@
 #include <isc/log.h>
 #include <isc/md.h>
 #include <isc/mem.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/random.h>
 #include <isc/string.h>

diff --git a/lib/isc/hmac.c b/lib/isc/hmac.c
index c300a306cb77c2acf26d04451e1275fcd2baabf6..b3940de52f65b854f648a9144bb0b546571fe59b 100644 (file)
--- a/lib/isc/hmac.c
+++ b/lib/isc/hmac.c
@@ -15,7 +15,6 @@
 #include <isc/assertions.h>
 #include <isc/hmac.h>
 #include <isc/md.h>
-#include <isc/platform.h>
 #include <isc/safe.h>
 #include <isc/string.h>
 #include <isc/types.h>

diff --git a/lib/isc/include/isc/aes.h b/lib/isc/include/isc/aes.h
index 42b6ab12e18ddf9177559e4841981d6ea6f87fa6..b8dbcb848fce02348d8654bfd73c2064a935dbba 100644 (file)
--- a/lib/isc/include/isc/aes.h
+++ b/lib/isc/include/isc/aes.h
@@ -15,7 +15,6 @@
 #define ISC_AES_H 1
 
 #include <isc/lang.h>
-#include <isc/platform.h>
 #include <isc/types.h>
 
 #define ISC_AES128_KEYLENGTH 16U

diff --git a/lib/isc/include/isc/assertions.h b/lib/isc/include/isc/assertions.h
index 8afac643b27d9011861eb58749080344e1c4e6af..5de20ce06c710316e481e77046d155364e6961ba 100644 (file)
--- a/lib/isc/include/isc/assertions.h
+++ b/lib/isc/include/isc/assertions.h
@@ -17,7 +17,6 @@
 #include <isc/attributes.h>
 #include <isc/lang.h>
 #include <isc/likely.h>
-#include <isc/platform.h>
 
 ISC_LANG_BEGINDECLS
 

diff --git a/lib/isc/include/isc/bind9.h b/lib/isc/include/isc/bind9.h
index dbc65c49879e67ae76f481dbd6ddbf2adc8fbc99..be5a7df3a1b97ea9db5f73b27b4fb26caa03f83a 100644 (file)
--- a/lib/isc/include/isc/bind9.h
+++ b/lib/isc/include/isc/bind9.h
@@ -14,8 +14,6 @@
 
 #include <stdbool.h>
 
-#include <isc/platform.h>
-
 /*
  * 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 223d81b1dc5b3ef3e6ca40338cbc03e4bbc746f3..778cb7aa208cc9fb82b5e23dcfcdbf12e5aee119 100644 (file)
--- a/lib/isc/include/isc/commandline.h
+++ b/lib/isc/include/isc/commandline.h
@@ -17,7 +17,6 @@
 #include <stdbool.h>
 
 #include <isc/lang.h>
-#include <isc/platform.h>
 #include <isc/result.h>
 
 /*% Index into parent argv vector. */

diff --git a/lib/isc/include/isc/dir.h b/lib/isc/include/isc/dir.h
index 8473f9bba8b0b186909c5ffcb3d810777aad602d..2b3bf34fc2ace5aa84b0c7ffde72a8b776af0011 100644 (file)
--- a/lib/isc/include/isc/dir.h
+++ b/lib/isc/include/isc/dir.h
@@ -17,7 +17,6 @@
 #include <limits.h>
 
 #include <isc/lang.h>
-#include <isc/platform.h>
 #include <isc/result.h>
 
 #include <sys/types.h> /* Required on some systems. */

diff --git a/lib/isc/include/isc/error.h b/lib/isc/include/isc/error.h
index 775a8dde8c9c166feaf683950175a1c771607e40..218b3c2ca32edabdea887be2f2307c7b4d8bcb0e 100644 (file)
--- a/lib/isc/include/isc/error.h
+++ b/lib/isc/include/isc/error.h
@@ -20,7 +20,6 @@
 #include <isc/formatcheck.h>
 #include <isc/lang.h>
 #include <isc/likely.h>
-#include <isc/platform.h>
 
 ISC_LANG_BEGINDECLS
 

diff --git a/lib/isc/include/isc/hmac.h b/lib/isc/include/isc/hmac.h
index f41b07d6bc321c6cdafc9b44309457c09517e8da..ce1660d59fafde5d6e92043257b7fb71312b44ce 100644 (file)
--- a/lib/isc/include/isc/hmac.h
+++ b/lib/isc/include/isc/hmac.h
@@ -18,7 +18,6 @@
 
 #include <isc/lang.h>
 #include <isc/md.h>
-#include <isc/platform.h>
 #include <isc/result.h>
 #include <isc/types.h>
 

diff --git a/lib/isc/include/isc/log.h b/lib/isc/include/isc/log.h
index 977a081c55c22896917af46723d4203a6b6721ee..1f9e62757087e67a4f169a69f8af5ba0a2d06e46 100644 (file)
--- a/lib/isc/include/isc/log.h
+++ b/lib/isc/include/isc/log.h
@@ -21,7 +21,6 @@
 
 #include <isc/formatcheck.h>
 #include <isc/lang.h>
-#include <isc/platform.h>
 #include <isc/types.h>
 
 /*@{*/

diff --git a/lib/isc/include/isc/md.h b/lib/isc/include/isc/md.h
index 163484fbae89c829f39bffe3ee377c671b5d0dac..3585a2312852952c2dc189bd05ce80bba54fdd96 100644 (file)
--- a/lib/isc/include/isc/md.h
+++ b/lib/isc/include/isc/md.h
@@ -17,7 +17,6 @@
 #pragma once
 
 #include <isc/lang.h>
-#include <isc/platform.h>
 #include <isc/result.h>
 #include <isc/types.h>
 

diff --git a/lib/isc/include/isc/mem.h b/lib/isc/include/isc/mem.h
index 404726d2fc909072c07e486060abb95cc975fa98..85973a755a20db2799d12c57a18294499f1a9bd5 100644 (file)
--- a/lib/isc/include/isc/mem.h
+++ b/lib/isc/include/isc/mem.h
@@ -20,7 +20,6 @@
 #include <isc/attributes.h>
 #include <isc/lang.h>
 #include <isc/mutex.h>
-#include <isc/platform.h>
 #include <isc/types.h>
 
 ISC_LANG_BEGINDECLS

diff --git a/lib/isc/include/isc/net.h b/lib/isc/include/isc/net.h
index 96bedf632d3b9562c089a356af4909bfac58a9a0..ec910e9d0cec77ffc3ff877503fafb0dc4f3423f 100644 (file)
--- a/lib/isc/include/isc/net.h
+++ b/lib/isc/include/isc/net.h
@@ -67,7 +67,6 @@
 #include <inttypes.h>
 
 #include <isc/lang.h>
-#include <isc/platform.h>
 #include <isc/types.h>
 
 #include <arpa/inet.h> /* Contractual promise. */

diff --git a/lib/isc/include/isc/once.h b/lib/isc/include/isc/once.h
index 3f9fe73a77713262effc1aab5b1815f07dbe3018..6bfa5cc1dc1ce336984ab4d707ace4b2462cb61b 100644 (file)
--- a/lib/isc/include/isc/once.h
+++ b/lib/isc/include/isc/once.h
@@ -16,7 +16,6 @@
 
 #include <pthread.h>
 
-#include <isc/platform.h>
 #include <isc/result.h>
 
 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 (file)
index ce32692..0000000
--- 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 96bdcd6353973408bcc28bd70adbcdc7bce4f2bf..73993c0ad40dcf148aa6bdff7239e19f0f941237 100644 (file)
--- a/lib/isc/include/isc/print.h
+++ b/lib/isc/include/isc/print.h
@@ -20,7 +20,6 @@
 
 #include <isc/formatcheck.h> /* Required for ISC_FORMAT_PRINTF() macro. */
 #include <isc/lang.h>
-#include <isc/platform.h>
 
 /***
  *** Functions

diff --git a/lib/isc/include/isc/refcount.h b/lib/isc/include/isc/refcount.h
index 26f962b2836f3c44590444d08df6e2d0857082cd..043ee4d0a45794c804d1fa2a88353d8f8a1e86f2 100644 (file)
--- a/lib/isc/include/isc/refcount.h
+++ b/lib/isc/include/isc/refcount.h
@@ -18,7 +18,6 @@
 #include <isc/error.h>
 #include <isc/lang.h>
 #include <isc/mutex.h>
-#include <isc/platform.h>
 #include <isc/types.h>
 
 /*! \file isc/refcount.h

diff --git a/lib/isc/include/isc/rwlock.h b/lib/isc/include/isc/rwlock.h
index cbcb2dfb46f0ba43d7f1bb9fa3743a48747b2a3e..82f415a24d50c4a56ef053f469aaf3ba816ad554 100644 (file)
--- a/lib/isc/include/isc/rwlock.h
+++ b/lib/isc/include/isc/rwlock.h
@@ -19,7 +19,6 @@
 #include <isc/atomic.h>
 #include <isc/condition.h>
 #include <isc/lang.h>
-#include <isc/platform.h>
 #include <isc/types.h>
 
 ISC_LANG_BEGINDECLS

diff --git a/lib/isc/include/isc/siphash.h b/lib/isc/include/isc/siphash.h
index 10957a9fddc6c3bf1708708f795f57c4d55c1840..ff94057264fcb94edc487677b1bfd601d536d30f 100644 (file)
--- a/lib/isc/include/isc/siphash.h
+++ b/lib/isc/include/isc/siphash.h
@@ -14,7 +14,6 @@
 #pragma once
 
 #include <isc/lang.h>
-#include <isc/platform.h>
 #include <isc/types.h>
 
 #define ISC_SIPHASH24_KEY_LENGTH 128 / 8

diff --git a/lib/isc/include/isc/string.h b/lib/isc/include/isc/string.h
index 2c187ff38a69936bca4da0923fc061455aacc1dc..7f67ad2ef7cb4534afc1a1c8431b41b2dc5f2156 100644 (file)
--- a/lib/isc/include/isc/string.h
+++ b/lib/isc/include/isc/string.h
@@ -15,8 +15,7 @@
 
 #include <string.h>
 
-#include "isc/lang.h"
-#include "isc/platform.h"
+#include <isc/lang.h>
 
 ISC_LANG_BEGINDECLS
 

diff --git a/lib/isc/log.c b/lib/isc/log.c
index 916e34db3dfcc3735ef819e9b1831f952fadd131..8f48f4718d8720e3c4cd1ab7ded451a2f5c39179 100644 (file)
--- a/lib/isc/log.c
+++ b/lib/isc/log.c
@@ -25,7 +25,6 @@
 #include <isc/log.h>
 #include <isc/magic.h>
 #include <isc/mem.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/rwlock.h>
 #include <isc/stat.h>

diff --git a/lib/isc/pk11.c b/lib/isc/pk11.c
index ba359482c30895ff1b8c0739e5f4af1a7c133c1d..5052406a6d4fe400d1d1535b92525246cdea7db4 100644 (file)
--- a/lib/isc/pk11.c
+++ b/lib/isc/pk11.c
@@ -19,7 +19,6 @@
 #include <isc/log.h>
 #include <isc/mem.h>
 #include <isc/once.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/stdio.h>
 #include <isc/strerr.h>

diff --git a/lib/isc/random.c b/lib/isc/random.c
index 7975d8581e7344694ff419648252176b6e472cb3..47c1f28cfd0bc00676b508217e66085afc727180 100644 (file)
--- a/lib/isc/random.c
+++ b/lib/isc/random.c
@@ -34,7 +34,6 @@
 #include <unistd.h>
 
 #include <isc/once.h>
-#include <isc/platform.h>
 #include <isc/random.h>
 #include <isc/result.h>
 #include <isc/thread.h>

diff --git a/lib/isc/resource.c b/lib/isc/resource.c
index 71143b770217a2aa61208d3369252e9c0f881083..73145d14dce1a495f960a7808b288a087fb4ffb3 100644 (file)
--- a/lib/isc/resource.c
+++ b/lib/isc/resource.c
@@ -15,7 +15,6 @@
 #include <sys/time.h> /* Required on some systems for <sys/resource.h>. */
 #include <sys/types.h>
 
-#include <isc/platform.h>
 #include <isc/resource.h>
 #include <isc/result.h>
 #include <isc/util.h>

diff --git a/lib/isc/rwlock.c b/lib/isc/rwlock.c
index 3441ce5c140f495386099ec05cf45a40ac0c6d36..7984a63042223a3878e34c27796d5dc55547a198 100644 (file)
--- a/lib/isc/rwlock.c
+++ b/lib/isc/rwlock.c
@@ -21,7 +21,6 @@
 
 #include <isc/atomic.h>
 #include <isc/magic.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/rwlock.h>
 #include <isc/util.h>

diff --git a/lib/isc/socket.c b/lib/isc/socket.c
index b086a07d8a519e950a460ff1152c1e37f61b1264..4b22d07fadc9a7132aa99ecc93cd519c78271b8a 100644 (file)
--- a/lib/isc/socket.c
+++ b/lib/isc/socket.c
@@ -46,7 +46,6 @@
 #include <isc/mutex.h>
 #include <isc/net.h>
 #include <isc/once.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/refcount.h>
 #include <isc/region.h>

diff --git a/lib/isc/stats.c b/lib/isc/stats.c
index 6df4af69524d67a1c5367f73e917fc466dd54ebb..ab599b18afb9e401d99711e25333db32cfdc87a9 100644 (file)
--- a/lib/isc/stats.c
+++ b/lib/isc/stats.c
@@ -18,7 +18,6 @@
 #include <isc/buffer.h>
 #include <isc/magic.h>
 #include <isc/mem.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/refcount.h>
 #include <isc/stats.h>

diff --git a/lib/isc/task.c b/lib/isc/task.c
index 6cb7f7f0ea7c3948203f16a4f48997107434496f..2cfe953b339b2f1243b88be3ae2df48825655a9d 100644 (file)
--- a/lib/isc/task.c
+++ b/lib/isc/task.c
@@ -26,7 +26,6 @@
 #include <isc/magic.h>
 #include <isc/mem.h>
 #include <isc/once.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/random.h>
 #include <isc/refcount.h>

diff --git a/lib/isc/tests/aes_test.c b/lib/isc/tests/aes_test.c
index 919c572786a8fdf69f07b66e57bda3d5b617db40..1f3d18f567dd7f087dc4fc842f5d8fd8134ee1ab 100644 (file)
--- a/lib/isc/tests/aes_test.c
+++ b/lib/isc/tests/aes_test.c
@@ -24,7 +24,6 @@
 #include <isc/aes.h>
 #include <isc/buffer.h>
 #include <isc/hex.h>
-#include <isc/platform.h>
 #include <isc/region.h>
 #include <isc/string.h>
 #include <isc/util.h>

diff --git a/lib/isc/tests/socket_test.c b/lib/isc/tests/socket_test.c
index 28a436b7d2206bf0c620c375b757b32be3b2f0cb..285e3c86abcd49547abebd27116b0ae187a201a9 100644 (file)
--- a/lib/isc/tests/socket_test.c
+++ b/lib/isc/tests/socket_test.c
@@ -26,7 +26,6 @@
 #include <cmocka.h>
 
 #include <isc/atomic.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/socket.h>
 #include <isc/task.h>

diff --git a/lib/isc/tests/task_test.c b/lib/isc/tests/task_test.c
index 57869971479822ccefb54184d8f683bb09d857a3..2be810d1793dbb19986a31135f64be64841260b7 100644 (file)
--- a/lib/isc/tests/task_test.c
+++ b/lib/isc/tests/task_test.c
@@ -31,7 +31,6 @@
 #include <isc/condition.h>
 #include <isc/managers.h>
 #include <isc/mem.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/task.h>
 #include <isc/time.h>

diff --git a/lib/isc/tests/timer_test.c b/lib/isc/tests/timer_test.c
index dc1223e318efb971c74df0145541797361237186..717732010e74a5bab4e0e1d18f4b7bc7e88e153c 100644 (file)
--- a/lib/isc/tests/timer_test.c
+++ b/lib/isc/tests/timer_test.c
@@ -27,7 +27,6 @@
 #include <isc/commandline.h>
 #include <isc/condition.h>
 #include <isc/mem.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/task.h>
 #include <isc/time.h>

diff --git a/lib/isc/time.c b/lib/isc/time.c
index 9ef93879d67b1bd42860e0ece96a6728862aedf7..727b39927144d82c58e29159dfd20625e980e57b 100644 (file)
--- a/lib/isc/time.c
+++ b/lib/isc/time.c
@@ -21,7 +21,6 @@
 #include <time.h>
 
 #include <isc/log.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/strerr.h>
 #include <isc/string.h>

diff --git a/lib/isc/timer.c b/lib/isc/timer.c
index eb8a17cfc0d1596474172a230c8e41571fc2a877..27025bf76f47b3cb883fa2b4544545dc5f9d75aa 100644 (file)
--- a/lib/isc/timer.c
+++ b/lib/isc/timer.c
@@ -20,7 +20,6 @@
 #include <isc/magic.h>
 #include <isc/mem.h>
 #include <isc/once.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/refcount.h>
 #include <isc/task.h>

diff --git a/lib/ns/client.c b/lib/ns/client.c
index d5766b8bdab77ba8eaa2dbd44da2937f772af15f..9fa9d865ec5e1d768160f3ace3f1d7405af1daae 100644 (file)
--- a/lib/ns/client.c
+++ b/lib/ns/client.c
@@ -21,7 +21,6 @@
 #include <isc/mutex.h>
 #include <isc/nonce.h>
 #include <isc/once.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/random.h>
 #include <isc/safe.h>

diff --git a/lib/ns/hooks.c b/lib/ns/hooks.c
index 095d6fa2bcd0c3532b2d2f180f373ae8ddf6661f..5b8d0ef8cad372c246f266396719c9eec08321ba 100644 (file)
--- a/lib/ns/hooks.c
+++ b/lib/ns/hooks.c
@@ -21,7 +21,6 @@
 #include <isc/log.h>
 #include <isc/mem.h>
 #include <isc/mutex.h>
-#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/result.h>
 #include <isc/types.h>

diff --git a/lib/ns/include/ns/client.h b/lib/ns/include/ns/client.h
index 690d1f114d22c72bbaf5a15cd3f3133d03d3f136..974e80dc1b48441977777394309aa69e102067ec 100644 (file)
--- a/lib/ns/include/ns/client.h
+++ b/lib/ns/include/ns/client.h
@@ -61,7 +61,6 @@
 #include <isc/buffer.h>
 #include <isc/magic.h>
 #include <isc/netmgr.h>
-#include <isc/platform.h>
 #include <isc/quota.h>
 #include <isc/stdtime.h>
 

diff --git a/lib/ns/tests/plugin_test.c b/lib/ns/tests/plugin_test.c
index 0e6296c601a474c1d04c020469cc38dfe4df1cdb..bb4fc95e0024987efcd58ec1552c78b058fc0329 100644 (file)
--- a/lib/ns/tests/plugin_test.c
+++ b/lib/ns/tests/plugin_test.c
@@ -26,7 +26,6 @@
 #include <isc/attributes.h>
 #include <isc/dir.h>
 #include <isc/mem.h>
-#include <isc/platform.h>
 #include <isc/result.h>
 #include <isc/types.h>
 #include <isc/util.h>

diff --git a/util/check-includes.pl b/util/check-includes.pl
index 1e9f566ff055c81bd921682650417b6fc352024e..2154d2f4e032dae8edd2503bd34daf0a3804dc43 100644 (file)
--- 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 <isc/platform.h>%m) {
-    print "$file has ISC_PLATFORM_ without <isc/platform.h>\n"
-      unless $file =~ m%isc/platform.h%;
-  }
-
   if ($file !~ m%isc/magic\.h$%) {
     print "$file has ISC_MAGIC_VALID without <isc/magic.h>\n"
       if /$nocomment.*ISC_MAGIC_VALID/m && ! m%^#include <isc/magic.h>%m;
@@ -234,13 +228,6 @@ for (<>) {
       next;
     }
 
-    if ($elided eq "<isc/platform.h>") {
-      if (! /^$nocomment.*ISC_PLATFORM_/m) {
-        print "$file has <isc/platform.h> but no ISC_PLATFORM_\n";
-      }
-      next;
-    }
-
     if ($elided eq "<isc/magic.h>") {
       if (! /^$nocomment.*ISC_MAGIC_VALID/m) {
         print "$file has <isc/magic.h> but no ISC_MAGIC_VALID\n";

diff --git a/util/copyrights b/util/copyrights
index e6cd90be9ce82c6ba2c9e3ff07222187e7589b6e..f982fbae206710c2fda4404bdbf3fe24fdc56500 100644 (file)
--- 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