cvs: php4 /ext/standard basic_functions.c file.c

jason Wed Jul 10 11:23:47 2002 EDT Modified files: /php4/ext/standard file.c basic_functions.c Log: @Fixed socket_set_timeout on win32 (Jason, Edin, Jani) Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.237 php4/ext/standard/file.c:1.238 --- php4/ext/standard/file.c:1.237 Mon Jul 8 14:29:54 2002 +++ php4/ext/standard/file.c Wed Jul 10 11:23:47 2002 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.237 2002/07/08 18:29:54 andi Exp $ */ +/* $Id: file.c,v 1.238 2002/07/10 15:23:47 jason Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -1035,9 +1035,9 @@ /* {{{ proto bool socket_set_timeout(int socket_descriptor, int seconds, int microseconds) Set timeout on socket read to seconds + microseonds */ +#if HAVE_SYS_TIME_H || defined(PHP_WIN32) PHP_FUNCTION(socket_set_timeout) { -#if HAVE_SYS_TIME_H zval **socket, **seconds, **microseconds; int type; void *what; @@ -1068,9 +1068,8 @@ } RETURN_FALSE; -#endif /* HAVE_SYS_TIME_H */ } - +#endif /* HAVE_SYS_TIME_H || defined(PHP_WIN32) */ /* }}} */ Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.484 php4/ext/standard/basic_functions.c:1.485 --- php4/ext/standard/basic_functions.c:1.484 Mon Jul 8 08:52:22 2002 +++ php4/ext/standard/basic_functions.c Wed Jul 10 11:23:47 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.484 2002/07/08 12:52:22 derick Exp $ */ +/* $Id: basic_functions.c,v 1.485 2002/07/10 15:23:47 jason Exp $ */ #include "php.h" #include "php_streams.h" @@ -614,7 +614,7 @@ PHP_FE(file_get_wrapper_data, NULL) PHP_FE(file_register_wrapper, NULL) -#if HAVE_SYS_TIME_H +#if HAVE_SYS_TIME_H || defined(PHP_WIN32) PHP_FE(socket_set_timeout, NULL) #endif