cvs: php4(PHP_4_2_0) /ext/standard basic_functions.c file.c
| From: | Jason Greene | Date: | Wed, 10 Jul 2002 14:59:22 +0000 |
| Subject: | cvs: php4(PHP_4_2_0) /ext/standard basic_functions.c file.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-12765@lists.php.net to get a copy of this message | ||
jason Wed Jul 10 10:59:22 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4/ext/standard file.c basic_functions.c
Log:
Fix socket_set_timeout on win32 ( was not being included )
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.205.2.2 php4/ext/standard/file.c:1.205.2.3
--- php4/ext/standard/file.c:1.205.2.2 Sun May 12 12:08:31 2002
+++ php4/ext/standard/file.c Wed Jul 10 10:59:21 2002
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.205.2.2 2002/05/12 16:08:31 rasmus Exp $ */
+/* $Id: file.c,v 1.205.2.3 2002/07/10 14:59:21 jason Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -878,7 +878,7 @@
Set timeout on socket read to seconds + microseonds */
PHP_FUNCTION(socket_set_timeout)
{
-#if HAVE_SYS_TIME_H
+#if HAVE_SYS_TIME_H || defined(PHP_WIN32)
zval **socket, **seconds, **microseconds;
int type;
void *what;
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.447.2.5 php4/ext/standard/basic_functions.c:1.447.2.6
--- php4/ext/standard/basic_functions.c:1.447.2.5 Mon Jun 24 04:07:40 2002
+++ php4/ext/standard/basic_functions.c Wed Jul 10 10:59:22 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.447.2.5 2002/06/24 08:07:40 derick Exp $ */
+/* $Id: basic_functions.c,v 1.447.2.6 2002/07/10 14:59:22 jason Exp $ */
#include "php.h"
#include "php_main.h"
@@ -626,7 +626,7 @@
PHP_FALIAS(fopenstream, warn_not_available, NULL)
#endif
-#if HAVE_SYS_TIME_H
+#if HAVE_SYS_TIME_H || defined(PHP_WIN32)
PHP_FE(socket_set_timeout, NULL)
#else
PHP_FALIAS(socket_set_timeout, warn_not_available, NULL)