summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2003-11-14 22:55:54 +0000
committerIlia Alshanetsky <iliaa@php.net>2003-11-14 22:55:54 +0000
commitc53b53f9265fa68e86b4f4a69bf961c158ce34cc (patch)
treebfb34488ec752fca4bdeca637f633f013cb83586
parent6b7bd4be8f9c839a66fee6328f32d13b58b65095 (diff)
downloadphp-git-c53b53f9265fa68e86b4f4a69bf961c158ce34cc.tar.gz
Rename nanosleep() to time_nanosleep().
-rw-r--r--NEWS2
-rw-r--r--ext/standard/basic_functions.c6
-rw-r--r--ext/standard/basic_functions.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index c1e4e2e956..5926026deb 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,7 @@ PHP NEWS
?? 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).
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 8175ad607d..94a51c718f 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -302,7 +302,7 @@ function_entry basic_functions[] = {
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 @@ PHP_FUNCTION(usleep)
/* }}} */
#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;
diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h
index b7341fe9d1..da43780f84 100644
--- a/ext/standard/basic_functions.h
+++ b/ext/standard/basic_functions.h
@@ -49,7 +49,7 @@ PHP_FUNCTION(toggle_short_open_tag);
PHP_FUNCTION(sleep);
PHP_FUNCTION(usleep);
#if HAVE_NANOSLEEP
-PHP_FUNCTION(nanosleep);
+PHP_FUNCTION(time_nanosleep);
#endif
PHP_FUNCTION(flush);
PHP_FUNCTION(ip2long);