Commit 43fe2897 authored by Mark Andrews's avatar Mark Andrews

1731. [port] darwin: relax version test in ifconfig.sh.

                        [RT #12581]

1730.   [port]          Determine the length type used by the socket API.
                        [RT #12581]
parent 110fbe3a
...@@ -15,9 +15,11 @@ ...@@ -15,9 +15,11 @@
1732. [placeholder] rt12467 1732. [placeholder] rt12467
1731. [placeholder] rt12581 1731. [port] darwin: relax version test in ifconfig.sh.
[RT #12581]
1730. [placeholder] rt12581 1730. [port] Determine the length type used by the socket API.
[RT #12581]
1729. [placeholder] rt12634 1729. [placeholder] rt12634
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: acconfig.h,v 1.45 2004/05/21 08:09:27 marka Exp $ */ /* $Id: acconfig.h,v 1.46 2004/10/05 03:17:16 marka Exp $ */
/*** /***
*** This file is not to be included by any public header files, because *** This file is not to be included by any public header files, because
...@@ -134,8 +134,11 @@ int sigwait(const unsigned int *set, int *sig); ...@@ -134,8 +134,11 @@ int sigwait(const unsigned int *set, int *sig);
/* define if you have strerror in the C library. */ /* define if you have strerror in the C library. */
#undef HAVE_STRERROR #undef HAVE_STRERROR
/* Define if you are running under Compaq TruCluster.. */ /* Define if you are running under Compaq TruCluster. */
#undef HAVE_TRUCLUSTER #undef HAVE_TRUCLUSTER
/* Define if OpenSSL includes DSA support */ /* Define if OpenSSL includes DSA support */
#undef HAVE_OPENSSL_DSA #undef HAVE_OPENSSL_DSA
/* Define to the length type used by the socket API (socklen_t, size_t, int). */
#undef ISC_SOCKADDR_LEN_T
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # PERFORMANCE OF THIS SOFTWARE.
# $Id: ifconfig.sh,v 1.48 2004/09/24 05:35:49 marka Exp $ # $Id: ifconfig.sh,v 1.49 2004/10/05 03:17:17 marka Exp $
# #
# Set up interface aliases for bind9 system tests. # Set up interface aliases for bind9 system tests.
...@@ -106,7 +106,7 @@ case "$1" in ...@@ -106,7 +106,7 @@ case "$1" in
*-sco3.2v*) *-sco3.2v*)
ifconfig lo0 alias 10.53.0.$ns ifconfig lo0 alias 10.53.0.$ns
;; ;;
*-darwin5*) *-darwin*)
ifconfig lo0 alias 10.53.0.$ns ifconfig lo0 alias 10.53.0.$ns
;; ;;
*) *)
...@@ -166,7 +166,7 @@ case "$1" in ...@@ -166,7 +166,7 @@ case "$1" in
*-sco3.2v*) *-sco3.2v*)
ifconfig lo0 -alias 10.53.0.$ns ifconfig lo0 -alias 10.53.0.$ns
;; ;;
*darwin5*) *darwin*)
ifconfig lo0 -alias 10.53.0.$ns ifconfig lo0 -alias 10.53.0.$ns
;; ;;
*) *)
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: config.h.in,v 1.62 2004/09/01 07:25:51 marka Exp $ */ /* $Id: config.h.in,v 1.63 2004/10/05 03:17:16 marka Exp $ */
/*** /***
*** This file is not to be included by any public header files, because *** This file is not to be included by any public header files, because
...@@ -134,12 +134,15 @@ int sigwait(const unsigned int *set, int *sig); ...@@ -134,12 +134,15 @@ int sigwait(const unsigned int *set, int *sig);
/* define if you have strerror in the C library. */ /* define if you have strerror in the C library. */
#undef HAVE_STRERROR #undef HAVE_STRERROR
/* Define if you are running under Compaq TruCluster.. */ /* Define if you are running under Compaq TruCluster. */
#undef HAVE_TRUCLUSTER #undef HAVE_TRUCLUSTER
/* Define if OpenSSL includes DSA support */ /* Define if OpenSSL includes DSA support */
#undef HAVE_OPENSSL_DSA #undef HAVE_OPENSSL_DSA
/* Define to the length type used by the socket API (socklen_t, size_t, int). */
#undef ISC_SOCKADDR_LEN_T
/* Define to 1 if you have the <dlfcn.h> header file. */ /* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H #undef HAVE_DLFCN_H
......
...@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl ...@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
esyscmd([sed "s/^/# /" COPYRIGHT])dnl esyscmd([sed "s/^/# /" COPYRIGHT])dnl
AC_DIVERT_POP()dnl AC_DIVERT_POP()dnl
AC_REVISION($Revision: 1.362 $) AC_REVISION($Revision: 1.363 $)
AC_INIT(lib/dns/name.c) AC_INIT(lib/dns/name.c)
AC_PREREQ(2.13) AC_PREREQ(2.13)
...@@ -261,6 +261,23 @@ AC_TRY_COMPILE(, [ ...@@ -261,6 +261,23 @@ AC_TRY_COMPILE(, [
AC_TYPE_SIZE_T AC_TYPE_SIZE_T
AC_CHECK_TYPE(ssize_t, int) AC_CHECK_TYPE(ssize_t, int)
AC_CHECK_TYPE(socklen_t,
[AC_DEFINE(ISC_SOCKADDR_LEN_T, socklen_t)],
[
AC_TRY_COMPILE(
[
#include <sys/types.h>
#include <sys/socket.h>
int getsockname(int, struct sockaddr *, size_t *);
],[],
[AC_DEFINE(ISC_SOCKADDR_LEN_T, size_t)],
[AC_DEFINE(ISC_SOCKADDR_LEN_T, int)])
],
[
#include <sys/types.h>
#include <sys/socket.h>
])
AC_SUBST(ISC_SOCKADDR_LEN_T)
AC_HEADER_TIME AC_HEADER_TIME
AC_MSG_CHECKING(for long long) AC_MSG_CHECKING(for long long)
AC_TRY_COMPILE([],[long long i = 0; return (0);], AC_TRY_COMPILE([],[long long i = 0; return (0);],
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: socket.c,v 1.241 2004/07/01 04:53:14 marka Exp $ */ /* $Id: socket.c,v 1.242 2004/10/05 03:17:18 marka Exp $ */
#include <config.h> #include <config.h>
...@@ -62,12 +62,8 @@ ...@@ -62,12 +62,8 @@
* some as socklen_t. This is here so it can be easily changed if needed. * some as socklen_t. This is here so it can be easily changed if needed.
*/ */
#ifndef ISC_SOCKADDR_LEN_T #ifndef ISC_SOCKADDR_LEN_T
#ifdef _BSD_SOCKLEN_T_
#define ISC_SOCKADDR_LEN_T _BSD_SOCKLEN_T_
#else
#define ISC_SOCKADDR_LEN_T unsigned int #define ISC_SOCKADDR_LEN_T unsigned int
#endif #endif
#endif
/* /*
* Define what the possible "soft" errors can be. These are non-fatal returns * Define what the possible "soft" errors can be. These are non-fatal returns
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment