cvs: php-src / NEWS /ext/standard basic_functions.c basic_functions.h
| From: | Ilia Alshanetsky | Date: | Fri, 14 Nov 2003 22:55:55 +0000 |
| Subject: | cvs: php-src / NEWS /ext/standard basic_functions.c basic_functions.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-24557@lists.php.net to get a copy of this message | ||
iliaa Fri Nov 14 17:55:55 2003 EDT
Modified files:
/php-src NEWS
/php-src/ext/standard basic_functions.c basic_functions.h
Log:
Rename nanosleep() to time_nanosleep().
Index: php-src/NEWS
diff -u php-src/NEWS:1.1498 php-src/NEWS:1.1499
--- php-src/NEWS:1.1498 Thu Nov 13 15:54:25 2003
+++ php-src/NEWS Fri Nov 14 17:55:53 2003
@@ -3,7 +3,7 @@
?? Oct 2003, PHP 5 Beta 3
- Added new functions:
. dba_key_split() to split inifile keys in an array. (Marcus)
- . nanosleep() signal safe sleep (Magnus, Ilia)
+ . time_nanosleep() signal safe sleep (Magnus, Ilia)
- Fixed bug #26072 (--disable-libxml does not work). (Jani)
- Fixed bug #26083 (Non-working write support in ext/dom). (Ilia)
- Fixed bug #24394 (Serializing cross-referenced objects causes segfault).
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.640 php-src/ext/standard/basic_functions.c:1.641
--- php-src/ext/standard/basic_functions.c:1.640 Wed Nov 12 18:43:46 2003
+++ php-src/ext/standard/basic_functions.c Fri Nov 14 17:55:54 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.640 2003/11/12 23:43:46 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.641 2003/11/14 22:55:54 iliaa Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -302,7 +302,7 @@
PHP_FE(sleep, NULL)
PHP_FE(usleep, NULL)
#if HAVE_NANOSLEEP
- PHP_FE(nanosleep, NULL)
+ PHP_FE(time_nanosleep, NULL)
#endif
PHP_FE(time, NULL)
PHP_FE(mktime, NULL)
@@ -1694,9 +1694,9 @@
/* }}} */
#if HAVE_NANOSLEEP
-/* {{{ proto mixed nanosleep(long seconds, long nanoseconds)
+/* {{{ proto mixed time_nanosleep(long seconds, long nanoseconds)
Delay for a number of seconds and nano seconds */
-PHP_FUNCTION(nanosleep)
+PHP_FUNCTION(time_nanosleep)
{
long tv_sec, tv_nsec;
struct timespec php_req, php_rem;
Index: php-src/ext/standard/basic_functions.h
diff -u php-src/ext/standard/basic_functions.h:1.127 php-src/ext/standard/basic_functions.h:1.128
--- php-src/ext/standard/basic_functions.h:1.127 Wed Nov 12 18:43:46 2003
+++ php-src/ext/standard/basic_functions.h Fri Nov 14 17:55:54 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.h,v 1.127 2003/11/12 23:43:46 iliaa Exp $ */
+/* $Id: basic_functions.h,v 1.128 2003/11/14 22:55:54 iliaa Exp $ */
#ifndef BASIC_FUNCTIONS_H
#define BASIC_FUNCTIONS_H
@@ -49,7 +49,7 @@
PHP_FUNCTION(sleep);
PHP_FUNCTION(usleep);
#if HAVE_NANOSLEEP
-PHP_FUNCTION(nanosleep);
+PHP_FUNCTION(time_nanosleep);
#endif
PHP_FUNCTION(flush);
PHP_FUNCTION(ip2long);