mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

silence broken IN6ADDR_{ANY,LOOPBACK}_INIT macros

Browse Source
This commit is contained in:
Mark Andrews
2001-07-04 05:18:12 +00:00
parent 60d17e54ea
commit 93373a8c3c
3 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/bind/config.h.in
View File

@@ -41,4 +41,4 @@
struct __sFILE; struct __sFILE;
extern __inline int __sputaux(int _c, struct __sFILE *_p); extern __inline int __sputaux(int _c, struct __sFILE *_p);
#endif #endif
#undef BROKEN_IN6ADDR_INIT_MACROS

11
lib/bind/configure.in
View File

@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
esyscmd([sed "s/^/# /" COPYRIGHT])dnl esyscmd([sed "s/^/# /" COPYRIGHT])dnl
AC_DIVERT_POP()dnl AC_DIVERT_POP()dnl
AC_REVISION($Revision: 1.62 $) AC_REVISION($Revision: 1.63 $)
AC_INIT(resolv/herror.c) AC_INIT(resolv/herror.c)
AC_PREREQ(2.13) AC_PREREQ(2.13)
@@ -1943,6 +1943,7 @@ AC_SUBST(SERV_R_SET_RETURN)
# #
AC_SUBST(ISC_PLATFORM_BRACEPTHREADONCEINIT) AC_SUBST(ISC_PLATFORM_BRACEPTHREADONCEINIT)
ISC_PLATFORM_BRACEPTHREADONCEINIT="#undef ISC_PLATFORM_BRACEPTHREADONCEINIT" ISC_PLATFORM_BRACEPTHREADONCEINIT="#undef ISC_PLATFORM_BRACEPTHREADONCEINIT"
BROKEN_IN6ADDR_INIT_MACROS="#undef BROKEN_IN6ADDR_INIT_MACROS"
case "$host" in case "$host" in
*-bsdi3.1*) *-bsdi3.1*)
@@ -1951,12 +1952,14 @@ case "$host" in
*-bsdi4.0*) *-bsdi4.0*)
hack_shutup_sigwait=yes hack_shutup_sigwait=yes
hack_shutup_sputaux=yes hack_shutup_sputaux=yes
hack_shutup_in6addr_init_macros=yes
;; ;;
*-bsdi4.1*) *-bsdi4.1*)
hack_shutup_stdargcast=yes hack_shutup_stdargcast=yes
;; ;;
*-solaris2.8) *-solaris2.8)
hack_shutup_pthreadonceinit=yes hack_shutup_pthreadonceinit=yes
hack_shutup_in6addr_init_macros=yes
;; ;;
esac esac
@@ -1996,6 +1999,12 @@ case "$hack_shutup_stdargcast" in
;; ;;
esac esac
case "$hack_shutup_in6addr_init_macros" in
yes)
AC_DEFINE(BROKEN_IN6ADDR_INIT_MACROS)
;;
esac
# #
# Substitutions # Substitutions
# #

31
lib/bind/port_after.h.in
View File

@@ -75,10 +75,37 @@ struct sockaddr_in6 {
struct in6_addr sin6_addr; /* IPv6 address */ struct in6_addr sin6_addr; /* IPv6 address */
u_int32_t sin6_scope_id; /* set of interfaces for a scope */ u_int32_t sin6_scope_id; /* set of interfaces for a scope */
}; };
#else
#define INET6 1
#endif /* HAS_INET6_STRUCTS */ #endif /* HAS_INET6_STRUCTS */
#ifdef BROKEN_IN6ADDR_INIT_MACROS
#undef IN6ADDR_ANY_INIT
#undef IN6ADDR_LOOPBACK_INIT
#endif
#ifndef IN6ADDR_ANY_INIT
#ifdef s6_addr
#define IN6ADDR_ANY_INIT \
{{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }}}
#else
#define IN6ADDR_ANY_INIT \
{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }}
#endif
#endif
#ifndef IN6ADDR_LOOPBACK_INIT
#ifdef s6_addr
#define IN6ADDR_LOOPBACK_INIT \
{{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }}}
#else
#define IN6ADDR_LOOPBACK_INIT \
{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }}
#endif
#endif
#ifndef HAVE_SOCKADDR_STORAGE #ifndef HAVE_SOCKADDR_STORAGE
#define __SS_MAXSIZE 128 #define __SS_MAXSIZE 128
#define __SS_ALLIGSIZE (sizeof (long)) #define __SS_ALLIGSIZE (sizeof (long))