Remove check for isc_port_t; Windows never have it, Unix always have it

diff --git a/configure b/configure
index a854aed4c48395cdd332e6ca66b013eaa68d1d93..e9b21a2089e658680de6be2d3d774f3035d64719 100755 (executable)
--- a/configure
+++ b/configure
@@ -738,7 +738,6 @@ ISC_PLATFORM_NEEDMEMMOVE
 ISC_IRS_GETNAMEINFOSOCKLEN
 ISC_IRS_NEEDADDRINFO
 ISC_PLATFORM_HAVETFO
-ISC_PLATFORM_NEEDPORTT
 ISC_PLATFORM_HAVEIF_LADDRCONF
 ISC_PLATFORM_HAVEIF_LADDRREQ
 BIND9_CO_RULE
@@ -17916,36 +17915,6 @@ rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-#
-# Look for in_port_t.
-#
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for type in_port_t" >&5
-$as_echo_n "checking for type in_port_t... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <sys/types.h>
-#include <netinet/in.h>
-int
-main ()
-{
-in_port_t port = 25; return (0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-       ISC_PLATFORM_NEEDPORTT="#undef ISC_PLATFORM_NEEDPORTT"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-       ISC_PLATFORM_NEEDPORTT="#define ISC_PLATFORM_NEEDPORTT 1"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
 #
 # Allow forcibly disabling TCP Fast Open support as autodetection might yield
 # confusing results on some systems (e.g. FreeBSD; see set_tcp_fastopen()

diff --git a/configure.in b/configure.in
index b919987e8e1a6f0e273adcc14e473f758bb3cb25..35c618a19e986d98584ff96e337cdcff967c72ad 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1245,7 +1245,7 @@ case "$use_gssapi" in
                DNS_GSSAPI_LIBS="-framework Kerberos"
                AC_MSG_RESULT(framework)
                ;;
-               
+
        *)
                AC_MSG_RESULT(looking in $use_gssapi/lib)
                USE_GSSAPI='-DGSSAPI'
@@ -1977,20 +1977,6 @@ AC_TRY_LINK([
        ISC_PLATFORM_HAVEIF_LADDRCONF="#undef ISC_PLATFORM_HAVEIF_LADDRCONF"])
 AC_SUBST(ISC_PLATFORM_HAVEIF_LADDRCONF)
 
-#
-# Look for in_port_t.
-#
-AC_MSG_CHECKING(for type in_port_t)
-AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <netinet/in.h>],
-[in_port_t port = 25; return (0);],
-       [AC_MSG_RESULT(yes)
-       ISC_PLATFORM_NEEDPORTT="#undef ISC_PLATFORM_NEEDPORTT"],
-       [AC_MSG_RESULT(no)
-       ISC_PLATFORM_NEEDPORTT="#define ISC_PLATFORM_NEEDPORTT 1"])
-AC_SUBST(ISC_PLATFORM_NEEDPORTT)
-
 #
 # Allow forcibly disabling TCP Fast Open support as autodetection might yield
 # confusing results on some systems (e.g. FreeBSD; see set_tcp_fastopen()
@@ -2114,7 +2100,7 @@ AC_ARG_ENABLE(getifaddrs,
 # This interface iteration code for getifaddrs() will fall back to using
 # /proc/net/if_inet6 if getifaddrs() in glibc doesn't return any IPv6
 # addresses.
-# 
+#
 case $want_getifaddrs in
 glibc)
 AC_MSG_WARN("--enable-getifaddrs=glibc is no longer required")
@@ -2964,11 +2950,11 @@ AC_SUBST(CURL)
 #   NOM_PATH_FILE(VARIABLE, FILENAME, DIRECTORIES)
 #
 # If the file FILENAME is found in one of the DIRECTORIES, the shell
-# variable VARIABLE is defined to its absolute pathname.  Otherwise, 
+# variable VARIABLE is defined to its absolute pathname.  Otherwise,
 # it is set to FILENAME, with no directory prefix (that's not terribly
 # useful, but looks less confusing in substitutions than leaving it
 # empty).  The variable VARIABLE will be substituted into output files.
-# 
+#
 
 AC_DEFUN([NOM_PATH_FILE], [
 $1=""
@@ -3344,7 +3330,7 @@ DLZ_SYSTEM_TEST=""
 DLZ_DRIVER_MYSQL_INCLUDES=""
 DLZ_DRIVER_MYSQL_LIBS=""
 
-# 
+#
 # Configure support for building a shared library object
 #
 # Even when libtool is available it can't always be relied upon
@@ -3482,8 +3468,8 @@ if test "yes" = "$cross_compiling"; then
        BUILD_LDFLAGS="$BUILD_LDFLAGS"
        BUILD_LIBS="$BUILD_LIBS"
 else
-       BUILD_CC="$CC" 
-       BUILD_CFLAGS="$CFLAGS" 
+       BUILD_CC="$CC"
+       BUILD_CFLAGS="$CFLAGS"
        BUILD_CPPFLAGS="$CPPFLAGS $GEN_NEED_OPTARG"
        BUILD_LDFLAGS="$LDFLAGS"
        BUILD_LIBS="$LIBS"
@@ -3803,7 +3789,7 @@ report() {
        echo "        Algorithm: $with_cc_alg"
     fi
 
-    # these lines are only printed if run with --enable-full-report 
+    # these lines are only printed if run with --enable-full-report
     if test "yes" = "$enable_full_report"; then
        test "no" = "$found_ipv6" || echo "    IPv6 support (--enable-ipv6)"
        test "X$PYTHON" = "X" || echo "    Python tools (--with-python)"

diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in
index deb4efad407c315c17de889af31a0af674d1c647..e2d3622ccce77f6fc6626ae59d11cbf88360fcc6 100644 (file)
--- a/lib/isc/include/isc/platform.h.in
+++ b/lib/isc/include/isc/platform.h.in
@@ -30,11 +30,6 @@
  *** Network.
  ***/
 
-/*! \brief
- * If this system needs in_port_t, ISC_PLATFORM_NEEDPORTT will be defined.
- */
-@ISC_PLATFORM_NEEDPORTT@
-
 /*! \brief
  * Define if the system has struct lifconf which is a extended struct ifconf
  * for IPv6.

diff --git a/lib/isc/unix/include/isc/net.h b/lib/isc/unix/include/isc/net.h
index 84c5fc9e7ac2feca78b67e20da2e716b54e54869..1f37c6d708c177211a4792b19fb02250778a4e92 100644 (file)
--- a/lib/isc/unix/include/isc/net.h
+++ b/lib/isc/unix/include/isc/net.h
@@ -158,13 +158,6 @@
 #define INADDR_LOOPBACK 0x7f000001UL
 #endif
 
-#ifdef ISC_PLATFORM_NEEDPORTT
-/*%
- * Ensure type in_port_t is defined.
- */
-typedef uint16_t in_port_t;
-#endif
-
 #ifndef MSG_TRUNC
 /*%
  * If this system does not have MSG_TRUNC (as returned from recvmsg())

diff --git a/lib/isc/win32/include/isc/net.h b/lib/isc/win32/include/isc/net.h
index 1fe214002bd53c8e7a6718a7d52ae2ae8afc9a10..54e1c31f905c1bf28a7a67dd8ceffe50803a32ee 100644 (file)
--- a/lib/isc/win32/include/isc/net.h
+++ b/lib/isc/win32/include/isc/net.h
@@ -108,9 +108,7 @@
 /*
  * Ensure type in_port_t is defined.
  */
-#ifdef ISC_PLATFORM_NEEDPORTT
 typedef uint16_t in_port_t;
-#endif
 
 /*
  * If this system does not have MSG_TRUNC (as returned from recvmsg())

diff --git a/lib/isc/win32/include/isc/platform.h.in b/lib/isc/win32/include/isc/platform.h.in
index dea6cb94c9599d366d15ecd5156b9ef866f471c1..80df0a0b11867336cfdfaee6a7ffedbd19a7bced 100644 (file)
--- a/lib/isc/win32/include/isc/platform.h.in
+++ b/lib/isc/win32/include/isc/platform.h.in
@@ -42,7 +42,6 @@
 #define PATH_MAX _MAX_PATH
 #endif
 
-#define ISC_PLATFORM_NEEDPORTT
 #undef MSG_TRUNC
 
 #define ISC_PLATFORM_NEEDSTRSEP