summaryrefslogtreecommitdiff
path: root/main/network.c
diff options
context:
space:
mode:
authorStig Venaas <venaas@php.net>2000-10-19 12:18:02 +0000
committerStig Venaas <venaas@php.net>2000-10-19 12:18:02 +0000
commit5fc85205d938e5d448e0b35ceb0519d69283833c (patch)
treee72662ab698b84f50d7eca08e245e8d3e42108f9 /main/network.c
parente8967fdc58216c69362e6b698130c19bac2287ce (diff)
downloadphp-git-5fc85205d938e5d448e0b35ceb0519d69283833c.tar.gz
Check that AF_INET6 is defined before using IPv6
Diffstat (limited to 'main/network.c')
-rw-r--r--main/network.c4
1 files changed, 2 insertions, 2 deletions
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;