Get rid of unnecessary configure script tests and missing/XXX.h headers.

This also fixes configure-script problems on OSes that have IPv6 support
but don't have <netinet6/in6.h> - no standard I could find requires that
header for IPv6 support (the Single UNIX Specification speaks of
<netinet/in.h> for both IPv4 and IPv6, and RFCs 2292 and 3542 don't
mention <netinet6/in6.h>, just <netinet/in.h> and <netinet6/ip6.h>).

diff --git a/Makefile.in b/Makefile.in
index 30b026c5aadff9b9fc55f6f5a55c0443e2ea114a..c7abfffcf5a927af9c62fef67d5e59bec30f18c2 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -227,7 +227,6 @@ EXTRA_DIST = \
        lbl/os-ultrix4.h \
        makemib \
        missing/addrinfo.h \
        lbl/os-ultrix4.h \
        makemib \
        missing/addrinfo.h \

-       missing/addrsize.h \

        missing/bittypes.h \
        missing/dlnames.c \
        missing/datalinks.c \
        missing/bittypes.h \
        missing/dlnames.c \
        missing/datalinks.c \


@@ -235,8 +234,6 @@ EXTRA_DIST = \
        missing/inet_aton.c \
        missing/inet_ntop.c \
        missing/inet_pton.c \
        missing/inet_aton.c \
        missing/inet_ntop.c \
        missing/inet_pton.c \

-       missing/resolv6.h \
-       missing/resolv_ext.h \

        missing/snprintf.c \
        missing/sockstorage.h \
        missing/strdup.c \
        missing/snprintf.c \
        missing/sockstorage.h \
        missing/strdup.c \

diff --git a/acconfig.h b/acconfig.h
index b877ed882facbf0ae010d25b876c1b46e5e5a441..9eb54f8b3dfa916c3990a731d7796effcb2c2780 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -8,12 +8,6 @@
 /* Define if you enable support for the libsmi. */
 #undef LIBSMI
 
 /* Define if you enable support for the libsmi. */
 #undef LIBSMI
 

-/* define if you have struct __res_state_ext */
-#undef HAVE_RES_STATE_EXT
-
-/* define if your struct __res_state has the nsort member */
-#undef HAVE_NEW_RES_STATE
-

 /* define if you have the addrinfo function. */
 #undef HAVE_ADDRINFO
 
 /* define if you have the addrinfo function. */
 #undef HAVE_ADDRINFO
 


@@ -23,15 +17,6 @@
 /* define ifyou have the h_errno variable. */
 #undef HAVE_H_ERRNO
 
 /* define ifyou have the h_errno variable. */
 #undef HAVE_H_ERRNO
 

-/* define if IN6ADDRSZ is defined (XXX not used!) */
-#undef HAVE_IN6ADDRSZ
-
-/* define if INADDRSZ is defined (XXX not used!) */
-#undef HAVE_INADDRSZ
-
-/* define if RES_USE_INET6 is defined */
-#undef HAVE_RES_USE_INET6
-

 /* define if you have struct sockaddr_storage */
 #undef HAVE_SOCKADDR_STORAGE
 
 /* define if you have struct sockaddr_storage */
 #undef HAVE_SOCKADDR_STORAGE
 

diff --git a/aclocal.m4 b/aclocal.m4
index 154b7e938b6d34aee83ef7276e76bcf312301fe5..7bc0c82b6b5045abaf543646638fc51977d06bcc 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1087,113 +1087,6 @@ AC_DEFUN(AC_STRUCT_SA_STORAGE, [
        fi
 ])
 
        fi
 ])
 

-dnl
-dnl Checks for macro of IP address size
-AC_DEFUN(AC_CHECK_ADDRSZ, [
-       $1=yes
-dnl check for INADDRSZ
-       AC_MSG_CHECKING(for INADDRSZ)
-       AC_CACHE_VAL(ac_cv_inaddrsz,
-       AC_TRY_COMPILE([
-#              include <arpa/nameser.h>],
-               [int a = INADDRSZ],
-               ac_cv_inaddrsz=yes,
-               ac_cv_inaddrsz=no))
-       AC_MSG_RESULT($ac_cv_inaddrsz)
-       if test $ac_cv_inaddrsz = yes; then
-               AC_DEFINE(HAVE_INADDRSZ)
-       else
-               $1=no
-       fi
-dnl check for IN6ADDRSZ
-       AC_MSG_CHECKING(for IN6ADDRSZ)
-       AC_CACHE_VAL(ac_cv_in6addrsz,
-       AC_TRY_COMPILE([
-#              include <arpa/nameser.h>],
-               [int a = IN6ADDRSZ],
-               ac_cv_in6addrsz=yes,
-               ac_cv_in6addrsz=no))
-       AC_MSG_RESULT($ac_cv_in6addrsz)
-       if test $ac_cv_in6addrsz = yes; then
-               AC_DEFINE(HAVE_IN6ADDRSZ)
-       else
-               $1=no
-       fi
-])
-
-dnl
-dnl check for RES_USE_INET6
-AC_DEFUN(AC_CHECK_RES_USE_INET6, [
-       AC_MSG_CHECKING(for RES_USE_INET6)
-       AC_CACHE_VAL($1,
-       AC_TRY_COMPILE([
-#              include <sys/types.h>
-#              include <netinet/in.h>
-#              include <resolv.h>],
-               [int a = RES_USE_INET6],
-               $1=yes,
-               $1=no))
-       AC_MSG_RESULT($$1)
-       if test $$1 = yes; then
-               AC_DEFINE(HAVE_RES_USE_INET6)
-       fi
-])
-
-dnl
-dnl check for AAAA
-AC_DEFUN(AC_CHECK_AAAA, [
-       AC_MSG_CHECKING(for AAAA)
-       AC_CACHE_VAL($1,
-       AC_TRY_COMPILE([
-#              include <sys/types.h>
-#              include <arpa/nameser.h>],
-               [int a = T_AAAA],
-               $1=yes,
-               $1=no))
-       AC_MSG_RESULT($$1)
-       if test $$1 = yes; then
-               AC_DEFINE(HAVE_AAAA)
-       fi
-])
-
-dnl
-dnl check for struct res_state_ext
-AC_DEFUN(AC_STRUCT_RES_STATE_EXT, [
-       AC_MSG_CHECKING(for res_state_ext)
-       AC_CACHE_VAL($1,
-       AC_TRY_COMPILE([
-#              include <sys/types.h>
-#              include <netinet/in.h>
-#              include <netinet6/in6.h>
-#              include <resolv.h>],
-               [struct __res_state_ext e],
-               $1=yes,
-               $1=no))
-       AC_MSG_RESULT($$1)
-       if test $$1 = yes; then
-               AC_DEFINE(HAVE_RES_STATE_EXT)
-       fi
-])
-
-dnl
-dnl check for struct res_state_ext
-AC_DEFUN(AC_STRUCT_RES_STATE, [
-       AC_MSG_CHECKING(for nsort in res_state)
-       AC_CACHE_VAL($1,
-       AC_TRY_COMPILE([
-#              include <sys/types.h>
-#              include <netinet/in.h>
-#              include <netinet6/in6.h>
-#              include <resolv.h>],
-               [struct __res_state e; e.nsort = 0],
-               $1=yes,
-               $1=no))
-       AC_MSG_RESULT($$1)
-       if test $$1 = yes; then
-               AC_DEFINE(HAVE_NEW_RES_STATE)
-       fi
-])
-

 dnl
 dnl check for h_errno
 AC_DEFUN(AC_VAR_H_ERRNO, [
 dnl
 dnl check for h_errno
 AC_DEFUN(AC_VAR_H_ERRNO, [

diff --git a/config.h.in b/config.h.in
index 82ddaa0e206bc837510756b0a9a4fec369d06099..9d2b3a0d3b6f20fd6fe119c89118a30ba3dcbad5 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -8,12 +8,6 @@
 /* Define if you enable support for the libsmi. */
 #undef LIBSMI
 
 /* Define if you enable support for the libsmi. */
 #undef LIBSMI
 

-/* define if you have struct __res_state_ext */
-#undef HAVE_RES_STATE_EXT
-
-/* define if your struct __res_state has the nsort member */
-#undef HAVE_NEW_RES_STATE
-

 /* define if you have the addrinfo function. */
 #undef HAVE_ADDRINFO
 
 /* define if you have the addrinfo function. */
 #undef HAVE_ADDRINFO
 


@@ -23,15 +17,6 @@
 /* define ifyou have the h_errno variable. */
 #undef HAVE_H_ERRNO
 
 /* define ifyou have the h_errno variable. */
 #undef HAVE_H_ERRNO
 

-/* define if IN6ADDRSZ is defined (XXX not used!) */
-#undef HAVE_IN6ADDRSZ
-
-/* define if INADDRSZ is defined (XXX not used!) */
-#undef HAVE_INADDRSZ
-
-/* define if RES_USE_INET6 is defined */
-#undef HAVE_RES_USE_INET6
-

 /* define if you have struct sockaddr_storage */
 #undef HAVE_SOCKADDR_STORAGE
 
 /* define if you have struct sockaddr_storage */
 #undef HAVE_SOCKADDR_STORAGE
 

diff --git a/configure b/configure
index 244019074d11c8f48f7fc834d36a4aec62a65fd5..ac16c5ae041056fb2cf8d92e0840b47f6136ce9a 100755 (executable)
--- a/configure
+++ b/configure
@@ -7706,326 +7706,6 @@ if test "$ac_cv_sa_storage" = no; then
 fi
 
 
 fi
 
 

-       ac_cv_addrsz=yes
-       { echo "$as_me:$LINENO: checking for INADDRSZ" >&5
-echo $ECHO_N "checking for INADDRSZ... $ECHO_C" >&6; }
-       if test "${ac_cv_inaddrsz+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#              include <arpa/nameser.h>
-int
-main ()
-{
-int a = INADDRSZ
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_inaddrsz=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_inaddrsz=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-       { echo "$as_me:$LINENO: result: $ac_cv_inaddrsz" >&5
-echo "${ECHO_T}$ac_cv_inaddrsz" >&6; }
-       if test $ac_cv_inaddrsz = yes; then
-               cat >>confdefs.h <<\_ACEOF
-#define HAVE_INADDRSZ 1
-_ACEOF
-
-       else
-               ac_cv_addrsz=no
-       fi
-       { echo "$as_me:$LINENO: checking for IN6ADDRSZ" >&5
-echo $ECHO_N "checking for IN6ADDRSZ... $ECHO_C" >&6; }
-       if test "${ac_cv_in6addrsz+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#              include <arpa/nameser.h>
-int
-main ()
-{
-int a = IN6ADDRSZ
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_in6addrsz=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_in6addrsz=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-       { echo "$as_me:$LINENO: result: $ac_cv_in6addrsz" >&5
-echo "${ECHO_T}$ac_cv_in6addrsz" >&6; }
-       if test $ac_cv_in6addrsz = yes; then
-               cat >>confdefs.h <<\_ACEOF
-#define HAVE_IN6ADDRSZ 1
-_ACEOF
-
-       else
-               ac_cv_addrsz=no
-       fi
-
-if test "$ac_cv_addrsz" = no; then
-       missing_includes=yes
-fi
-
-
-       { echo "$as_me:$LINENO: checking for RES_USE_INET6" >&5
-echo $ECHO_N "checking for RES_USE_INET6... $ECHO_C" >&6; }
-       if test "${ac_cv_res_inet6+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#              include <sys/types.h>
-#              include <netinet/in.h>
-#              include <resolv.h>
-int
-main ()
-{
-int a = RES_USE_INET6
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_res_inet6=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_res_inet6=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-       { echo "$as_me:$LINENO: result: $ac_cv_res_inet6" >&5
-echo "${ECHO_T}$ac_cv_res_inet6" >&6; }
-       if test $ac_cv_res_inet6 = yes; then
-               cat >>confdefs.h <<\_ACEOF
-#define HAVE_RES_USE_INET6 1
-_ACEOF
-
-       fi
-
-if test "$ac_cv_res_inet6" = no; then
-       missing_includes=yes
-fi
-
-
-       { echo "$as_me:$LINENO: checking for res_state_ext" >&5
-echo $ECHO_N "checking for res_state_ext... $ECHO_C" >&6; }
-       if test "${ac_cv_res_state_ext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#              include <sys/types.h>
-#              include <netinet/in.h>
-#              include <netinet6/in6.h>
-#              include <resolv.h>
-int
-main ()
-{
-struct __res_state_ext e
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_res_state_ext=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_res_state_ext=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-       { echo "$as_me:$LINENO: result: $ac_cv_res_state_ext" >&5
-echo "${ECHO_T}$ac_cv_res_state_ext" >&6; }
-       if test $ac_cv_res_state_ext = yes; then
-               cat >>confdefs.h <<\_ACEOF
-#define HAVE_RES_STATE_EXT 1
-_ACEOF
-
-       fi
-
-if test "$ac_cv_res_state_ext" = no; then
-       missing_includes=yes
-fi
-
-
-       { echo "$as_me:$LINENO: checking for nsort in res_state" >&5
-echo $ECHO_N "checking for nsort in res_state... $ECHO_C" >&6; }
-       if test "${ac_cv_res_state+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#              include <sys/types.h>
-#              include <netinet/in.h>
-#              include <netinet6/in6.h>
-#              include <resolv.h>
-int
-main ()
-{
-struct __res_state e; e.nsort = 0
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_res_state=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_res_state=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-       { echo "$as_me:$LINENO: result: $ac_cv_res_state" >&5
-echo "${ECHO_T}$ac_cv_res_state" >&6; }
-       if test $ac_cv_res_state = yes; then
-               cat >>confdefs.h <<\_ACEOF
-#define HAVE_NEW_RES_STATE 1
-_ACEOF
-
-       fi
-
-
-
-

 
 
 
 
 
 

diff --git a/configure.in b/configure.in
index ab46e715a5f30fbfc270445bcb32133c89655d9b..11deb6603a63efa6504f65be6552ad6f0bee62b5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -504,32 +504,6 @@ if test "$ac_cv_sa_storage" = no; then
        missing_includes=yes
 fi
 
        missing_includes=yes
 fi
 

-dnl
-dnl Checks for IN[6]ADDRSZ
-AC_CHECK_ADDRSZ(ac_cv_addrsz)
-if test "$ac_cv_addrsz" = no; then
-       missing_includes=yes
-fi
-
-dnl
-dnl Checks for RES_USE_INET6
-AC_CHECK_RES_USE_INET6(ac_cv_res_inet6)
-if test "$ac_cv_res_inet6" = no; then
-       missing_includes=yes
-fi
-
-dnl
-dnl Checks for res_state_ext structure
-AC_STRUCT_RES_STATE_EXT(ac_cv_res_state_ext)
-if test "$ac_cv_res_state_ext" = no; then
-       missing_includes=yes
-fi
-
-dnl
-dnl Checks if res_state structure has nsort member.
-AC_STRUCT_RES_STATE(ac_cv_res_state)
-
-

 AC_REPLACE_FUNCS(vfprintf strcasecmp strlcat strlcpy strdup strsep)
 AC_CHECK_FUNCS(fork vfork strftime)
 AC_CHECK_FUNCS(setlinebuf alarm)
 AC_REPLACE_FUNCS(vfprintf strcasecmp strlcat strlcpy strdup strsep)
 AC_CHECK_FUNCS(fork vfork strftime)
 AC_CHECK_FUNCS(setlinebuf alarm)

diff --git a/missing/addrsize.h b/missing/addrsize.h
deleted file mode 100644 (file)
index 13db4da..0000000
--- a/missing/addrsize.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 1999 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#ifndef INADDRSZ
-#define INADDRSZ 4             /* IPv4 T_A */
-#endif
-
-#ifndef IN6ADDRSZ
-#define IN6ADDRSZ      16      /* IPv6 T_AAAA */
-#endif
-

diff --git a/missing/resolv6.h b/missing/resolv6.h
deleted file mode 100644 (file)
index ccee03e..0000000
--- a/missing/resolv6.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 1999 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Resolver options for IPv6.
- * XXX: this should be in an offical include file. There may be conflicts...
- */
-#ifndef HAVE_RES_USE_INET6
-#define        RES_USE_INET6   0x80000000      /* use/map IPv6 in gethostbyname() */
-#endif

diff --git a/missing/resolv_ext.h b/missing/resolv_ext.h
deleted file mode 100644 (file)
index 92c531d..0000000
--- a/missing/resolv_ext.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 1999 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef MAXRESOLVSORT          /* XXX */
-#define        MAXRESOLVSORT           10      /* number of net to sort on */
-#endif
-
-#ifndef HAVE_RES_STATE_EXT
-struct __res_state_ext {
-       struct sockaddr_storage nsaddr_list[MAXNS];
-       struct {
-               int af;         /* address family for addr, mask */
-               union {
-                       struct in_addr ina;
-#ifdef INET6
-                       struct in6_addr in6a;
-#endif
-               } addr, mask;
-       } sort_list[MAXRESOLVSORT];
-};
-#endif
-
-extern struct __res_state_ext _res_ext;