cvs: php-src(PHP_5_0) /ext/standard basic_functions.c /main php.h

andrey Tue Nov 2 12:25:14 2004 EDT Modified files: (Branch: PHP_5_0) /php-src/main php.h /php-src/ext/standard basic_functions.c Log: MFH http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.203&r2=1.203.2.1&ty=u Index: php-src/main/php.h diff -u php-src/main/php.h:1.203 php-src/main/php.h:1.203.2.1 --- php-src/main/php.h:1.203 Sun Jan 11 19:19:40 2004 +++ php-src/main/php.h Tue Nov 2 12:25:13 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.203 2004/01/12 00:19:40 helly Exp $ */ +/* $Id: php.h,v 1.203.2.1 2004/11/02 17:25:13 andrey Exp $ */ #ifndef PHP_H #define PHP_H @@ -271,6 +271,7 @@ #else /* NETWARE */ extern char **environ; #define php_sleep sleep +#define PHP_SLEEP_NON_VOID #endif /* NETWARE */ #endif /* !defined(PHP_WIN32) */ http://cvs.php.net/diff.php/php-src/ext/standard/basic_functions.c?r1=1.673.2.4&r2=1.673.2.5&ty=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.673.2.4 php-src/ext/standard/basic_functions.c:1.673.2.5 --- php-src/ext/standard/basic_functions.c:1.673.2.4 Thu Aug 19 11:15:32 2004 +++ php-src/ext/standard/basic_functions.c Tue Nov 2 12:25:14 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.673.2.4 2004/08/19 15:15:32 tony2001 Exp $ */ +/* $Id: basic_functions.c,v 1.673.2.5 2004/11/02 17:25:14 andrey Exp $ */ #include "php.h" #include "php_streams.h" @@ -1649,7 +1649,14 @@ } convert_to_long_ex(num); - php_sleep(Z_LVAL_PP(num)); +#ifdef PHP_SLEEP_NON_VOID + RETURN_LONG( +#endif + php_sleep(Z_LVAL_PP(num)) +#ifdef PHP_SLEEP_NON_VOID + ) +#endif + ; } /* }}} */