Remove do-nothing header <isc/netdb.h>

Not needed since we dropped Windows support

diff --git a/bin/check/check-tool.c b/bin/check/check-tool.c
index ce36194d7ae7cb9dff1bce16f865f35fd0c8dc3f..748f5918521a832f99b7f1106d3ff70be6f3c436 100644 (file)
--- a/bin/check/check-tool.c
+++ b/bin/check/check-tool.c
@@ -14,6 +14,7 @@
 /*! \file */
 
 #include <inttypes.h>
+#include <netdb.h>
 #include <stdbool.h>
 #include <stdio.h>
 
@@ -21,7 +22,6 @@
 #include <isc/log.h>
 #include <isc/mem.h>
 #include <isc/net.h>
-#include <isc/netdb.h>
 #include <isc/print.h>
 #include <isc/region.h>
 #include <isc/result.h>

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 6e4aefc51e602daf906c32c279ce7c1d7e7c1c80..e6eead53fdd9aa72ec9215615c840de3116d9273 100644 (file)
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -25,6 +25,7 @@
 #include <inttypes.h>
 #include <limits.h>
 #include <locale.h>
+#include <netdb.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
@@ -42,7 +43,6 @@
 #include <isc/loop.h>
 #include <isc/managers.h>
 #include <isc/netaddr.h>
-#include <isc/netdb.h>
 #include <isc/nonce.h>
 #include <isc/parseint.h>
 #include <isc/print.h>

diff --git a/lib/bind9/getaddresses.c b/lib/bind9/getaddresses.c
index 5fa77704fe79ad1573e7ea0457d0c5c18e24e89f..9e2e9d3d796caf25627fa00bba5f003c16a62706 100644 (file)
--- a/lib/bind9/getaddresses.c
+++ b/lib/bind9/getaddresses.c
@@ -14,12 +14,12 @@
 /*! \file */
 
 #include <inttypes.h>
+#include <netdb.h>
 #include <stdbool.h>
 #include <string.h>
 
 #include <isc/net.h>
 #include <isc/netaddr.h>
-#include <isc/netdb.h>
 #include <isc/netscope.h>
 #include <isc/result.h>
 #include <isc/sockaddr.h>

diff --git a/lib/dns/rdata/in_1/wks_11.c b/lib/dns/rdata/in_1/wks_11.c
index ca55126fd1d945a475f5357f8172d861472b53f0..0c9163a2bdfced6cebc07e0e05c41669397a5dfc 100644 (file)
--- a/lib/dns/rdata/in_1/wks_11.c
+++ b/lib/dns/rdata/in_1/wks_11.c
@@ -15,11 +15,10 @@
 #define RDATA_IN_1_WKS_11_C
 
 #include <limits.h>
-#include <stdlib.h>
+#include <netdb.h>
 
 #include <isc/ascii.h>
 #include <isc/net.h>
-#include <isc/netdb.h>
 #include <isc/once.h>
 
 #define RRTYPE_WKS_ATTRIBUTES (0)

diff --git a/lib/isc/Makefile.am b/lib/isc/Makefile.am
index 8bc44fc864c108e848f4837a04cf71a30b5b5111..314a70df91f2eb3408eda2d69ef4f4e23cddd9e4 100644 (file)
--- a/lib/isc/Makefile.am
+++ b/lib/isc/Makefile.am
@@ -58,7 +58,6 @@ libisc_la_HEADERS =                   \
        include/isc/mutexblock.h        \
        include/isc/net.h               \
        include/isc/netaddr.h           \
-       include/isc/netdb.h             \
        include/isc/netmgr.h            \
        include/isc/netscope.h          \
        include/isc/nonce.h             \

diff --git a/lib/isc/dir.c b/lib/isc/dir.c
index 473618cb57ee2d34bec4bad689efbce1c62a42ad..9104ca4250ca06e03a5d0966be8f436effc7c030 100644 (file)
--- a/lib/isc/dir.c
+++ b/lib/isc/dir.c
@@ -15,13 +15,13 @@
 
 #include <ctype.h>
 #include <errno.h>
+#include <netdb.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include <isc/dir.h>
 #include <isc/magic.h>
-#include <isc/netdb.h>
 #include <isc/print.h>
 #include <isc/string.h>
 #include <isc/util.h>

diff --git a/lib/isc/include/isc/netdb.h b/lib/isc/include/isc/netdb.h
deleted file mode 100644 (file)
index 93799d7..0000000
--- a/lib/isc/include/isc/netdb.h
+++ /dev/null
@@ -1,48 +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
-
-/*****
-***** Module Info
-*****/
-
-/*! \file
- * \brief
- * Portable netdb.h support.
- *
- * This module is responsible for defining the get<x>by<y> APIs.
- *
- * MP:
- *\li  No impact.
- *
- * Reliability:
- *\li  No anticipated impact.
- *
- * Resources:
- *\li  N/A.
- *
- * Security:
- *\li  No anticipated impact.
- *
- * Standards:
- *\li  BSD API
- */
-
-/***
- *** Imports.
- ***/
-
-#include <netdb.h>
-
-#include <isc/net.h>

diff --git a/lib/isc/net.c b/lib/isc/net.c
index 4ac0450388588dfd308577ec57277fe81ad12e10..507fdf5dbb059938fdce402784ef52c3567de38f 100644 (file)
--- a/lib/isc/net.c
+++ b/lib/isc/net.c
@@ -22,12 +22,12 @@
 #endif /* if defined(HAVE_SYS_SYSCTL_H) && !defined(__linux__) */
 #include <errno.h>
 #include <fcntl.h>
+#include <netdb.h>
 #include <sys/uio.h>
 #include <unistd.h>
 
 #include <isc/log.h>
 #include <isc/net.h>
-#include <isc/netdb.h>
 #include <isc/once.h>
 #include <isc/strerr.h>
 #include <isc/string.h>

diff --git a/lib/isc/sockaddr.c b/lib/isc/sockaddr.c
index 038e3ec7c42273e8a5f4148017d698ce5903b6a5..529e820babaa15397d7452787dede6147e5cb8ee 100644 (file)
--- a/lib/isc/sockaddr.c
+++ b/lib/isc/sockaddr.c
@@ -13,6 +13,7 @@
 
 /*! \file */
 
+#include <netdb.h>
 #include <stdbool.h>
 #include <stdio.h>