diff options
| author | Stig Venaas <venaas@php.net> | 2000-10-19 12:18:02 +0000 |
|---|---|---|
| committer | Stig Venaas <venaas@php.net> | 2000-10-19 12:18:02 +0000 |
| commit | 5fc85205d938e5d448e0b35ceb0519d69283833c (patch) | |
| tree | e72662ab698b84f50d7eca08e245e8d3e42108f9 | |
| parent | e8967fdc58216c69362e6b698130c19bac2287ce (diff) | |
| download | php-git-5fc85205d938e5d448e0b35ceb0519d69283833c.tar.gz | |
Check that AF_INET6 is defined before using IPv6
| -rw-r--r-- | configure.in | 12 | ||||
| -rw-r--r-- | main/network.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/configure.in b/configure.in index 889c3018b2..a1c45fcd47 100644 --- a/configure.in +++ b/configure.in @@ -333,13 +333,13 @@ dnl Checks for types AC_TYPE_SIZE_T AC_TYPE_UID_T -dnl Check for struct sockaddr_in6 -AC_CACHE_CHECK([for struct sockaddr_in6], ac_cv_struct_sockaddr_in6, +dnl Check for IPv6 support +AC_CACHE_CHECK([for IPv6 support], ac_cv_ipv6_support, [AC_TRY_COMPILE([#include <sys/socket.h> -#include <netinet/in.h>], [struct sockaddr_in6 s; s;], - ac_cv_struct_sockaddr_in6=yes, ac_cv_struct_sockaddr_in6=no)]) -if test "$ac_cv_struct_sockaddr_in6" = yes; then - AC_DEFINE(HAVE_STRUCT_SOCKADDR_IN6,1,[Whether you have struct sockaddr_in6]) +#include <netinet/in.h>], [struct sockaddr_in6 s; int i=AF_INET6; s], + ac_cv_ipv6_support=yes, ac_cv_ipv6_support=no)]) +if test "$ac_cv_ipv6_support" = yes; then + AC_DEFINE(HAVE_IPV6,1,[Whether you have IPv6 support]) fi dnl Checks for library functions. diff --git a/main/network.c b/main/network.c index 1bbd75e5cf..94f358c532 100644 --- a/main/network.c +++ b/main/network.c @@ -93,7 +93,7 @@ static int php_network_getaddresses(const char *host, struct sockaddr ***sal) sap = *sal; do { switch (sai->ai_family) { -# ifdef HAVE_STRUCT_SOCKADDR_IN6 +# ifdef HAVE_IPV6 case AF_INET6: { *sap = emalloc(sizeof(struct sockaddr_in6)); if (*sap == NULL) { @@ -170,7 +170,7 @@ int php_hostconnect(char *host, unsigned short port, int socktype, int timeout) s = socket((*sal)->sa_family, socktype, 0); if (s != SOCK_ERR) { switch ((*sal)->sa_family) { -#if defined( HAVE_GETADDRINFO ) && defined( HAVE_STRUCT_SOCKADDR_IN6 ) +#if defined( HAVE_GETADDRINFO ) && defined( HAVE_IPV6 ) case AF_INET6: { struct sockaddr_in6 *sa = (struct sockaddr_in6 *)*sal; |