Commit 1cc50d31 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

changed HAVE_SIN6_SCOPE_ID define to HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID since... 

changed HAVE_SIN6_SCOPE_ID define to HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID since just found that ares already uses this define.
parent 104377d7

configure.ac

+3 −3
Original line number Diff line number Diff line
@@ -827,7 +827,7 @@ if test "$ipv6" = yes; then 
  struct sockaddr_in6 s; s.sin6_scope_id = 0; , have_sin6_scope_id=yes)

  if test "$have_sin6_scope_id" = yes; then

    AC_MSG_RESULT([yes])

  	AC_DEFINE(HAVE_SIN6_SCOPE_ID, 1, [Define to 1 if struct sockaddr_in6 has the sin6_scope_id member])

    AC_DEFINE(HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID, 1, [Define to 1 if struct sockaddr_in6 has the sin6_scope_id member])

  else

    AC_MSG_RESULT([no])

  fi

lib/Makefile.netware

+1 −1
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ ifdef ENABLE_IPV6 
	@echo $(DL)#define ENABLE_IPV6 1$(DL) >> $@

	@echo $(DL)#define HAVE_FREEADDRINFO 1$(DL) >> $@

	@echo $(DL)#define HAVE_GETADDRINFO 1$(DL) >> $@

	@echo $(DL)#define HAVE_SIN6_SCOPE_ID 1$(DL) >> $@

	@echo $(DL)#define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1$(DL) >> $@

endif

endif

	@echo $(DL)#define USE_MANUAL 1$(DL) >> $@

lib/config-os400.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
#define ENABLE_IPV6



/* Define if struct sockaddr_in6 has the sin6_scope_id member */

#define HAVE_SIN6_SCOPE_ID 1

#define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1



/* Define this to 'int' if ssize_t is not an available typedefed type */

#undef ssize_t

lib/config-riscos.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#undef ENABLE_IPV6



/* Define if struct sockaddr_in6 has the sin6_scope_id member */

#define HAVE_SIN6_SCOPE_ID 1

#define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1



/* Define this to 'int' if ssize_t is not an available typedefed type */

#undef ssize_t

lib/config-symbian.h

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
#define ENABLE_IPV6 1



/* Define if struct sockaddr_in6 has the sin6_scope_id member */

#define HAVE_SIN6_SCOPE_ID 1

#define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1



/* Define to the type qualifier of arg 1 for getnameinfo. */

#define GETNAMEINFO_QUAL_ARG1 const