@Fixed socket_set_timeout on win32 (Jason, Edin, Jani)

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 4634a71e1e711a7283ddcd453b25e344525efe8b..37e4abe078151431906b9c2da9ec93e43b17541b 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -614,7 +614,7 @@ function_entry basic_functions[] = {
        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
 

diff --git a/ext/standard/file.c b/ext/standard/file.c
index dbd15ae99ae277c828eaa73e3544a2c9b05211bf..7fd6181e87ec56f3556e3d6ae220fab97638618d 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -1035,9 +1035,9 @@ PHP_FUNCTION(set_socket_blocking)
 
 /* {{{ 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 @@ PHP_FUNCTION(socket_set_timeout)
        }
 
        RETURN_FALSE;
-#endif /* HAVE_SYS_TIME_H */
 }
-
+#endif /* HAVE_SYS_TIME_H || defined(PHP_WIN32) */
 /* }}} */