cvs: php4 /ext/standard ftp_fopen_wrapper.c http_fopen_wrapper.c /main fopen_wrappers.c network.c

alexwaugh Sat Dec 22 19:46:13 2001 EDT Modified files: /php4/ext/standard ftp_fopen_wrapper.c http_fopen_wrapper.c /php4/main fopen_wrappers.c network.c Log: Undefine AF_UNIX under RISC OS Index: php4/ext/standard/ftp_fopen_wrapper.c diff -u php4/ext/standard/ftp_fopen_wrapper.c:1.12 php4/ext/standard/ftp_fopen_wrapper.c:1.13 --- php4/ext/standard/ftp_fopen_wrapper.c:1.12 Tue Dec 11 10:30:31 2001 +++ php4/ext/standard/ftp_fopen_wrapper.c Sat Dec 22 19:46:13 2001 @@ -17,7 +17,7 @@ | Hartmut Holzgraefe <hholzgra@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: ftp_fopen_wrapper.c,v 1.12 2001/12/11 15:30:31 sebastian Exp $ */ +/* $Id: ftp_fopen_wrapper.c,v 1.13 2001/12/23 00:46:13 alexwaugh Exp $ */ #include "php.h" #include "php_globals.h" @@ -56,7 +56,7 @@ #endif #endif -#ifdef PHP_WIN32 +#if defined(PHP_WIN32) || defined(__riscos__) #undef AF_UNIX #endif Index: php4/ext/standard/http_fopen_wrapper.c diff -u php4/ext/standard/http_fopen_wrapper.c:1.21 php4/ext/standard/http_fopen_wrapper.c:1.22 --- php4/ext/standard/http_fopen_wrapper.c:1.21 Tue Dec 11 10:30:31 2001 +++ php4/ext/standard/http_fopen_wrapper.c Sat Dec 22 19:46:13 2001 @@ -17,7 +17,7 @@ | Hartmut Holzgraefe <hholzgra@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: http_fopen_wrapper.c,v 1.21 2001/12/11 15:30:31 sebastian Exp $ */ +/* $Id: http_fopen_wrapper.c,v 1.22 2001/12/23 00:46:13 alexwaugh Exp $ */ #include "php.h" #include "php_globals.h" @@ -56,7 +56,7 @@ #endif #endif -#ifdef PHP_WIN32 +#if defined(PHP_WIN32) || defined(__riscos__) #undef AF_UNIX #endif Index: php4/main/fopen_wrappers.c diff -u php4/main/fopen_wrappers.c:1.139 php4/main/fopen_wrappers.c:1.140 --- php4/main/fopen_wrappers.c:1.139 Tue Dec 11 10:31:01 2001 +++ php4/main/fopen_wrappers.c Sat Dec 22 19:46:13 2001 @@ -16,7 +16,7 @@ | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen_wrappers.c,v 1.139 2001/12/11 15:31:01 sebastian Exp $ */ +/* $Id: fopen_wrappers.c,v 1.140 2001/12/23 00:46:13 alexwaugh Exp $ */ /* {{{ includes */ @@ -73,7 +73,7 @@ #endif #endif -#ifdef PHP_WIN32 +#if defined(PHP_WIN32) || defined(__riscos__) #undef AF_UNIX #endif Index: php4/main/network.c diff -u php4/main/network.c:1.23 php4/main/network.c:1.24 --- php4/main/network.c:1.23 Tue Dec 11 10:31:03 2001 +++ php4/main/network.c Sat Dec 22 19:46:13 2001 @@ -15,7 +15,7 @@ | Authors: Stig Venaas <venaas@uninett.no> | +----------------------------------------------------------------------+ */ -/* $Id: network.c,v 1.23 2001/12/11 15:31:03 sebastian Exp $ */ +/* $Id: network.c,v 1.24 2001/12/23 00:46:13 alexwaugh Exp $ */ #include "php.h" @@ -55,7 +55,7 @@ #include "php_network.h" -#ifdef PHP_WIN32 +#if defined(PHP_WIN32) || defined(__riscos__) #undef AF_UNIX #endif