summaryrefslogtreecommitdiff
path: root/ext/standard/microtime.c
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2002-10-29 23:35:49 +0000
committerMarcus Boerger <helly@php.net>2002-10-29 23:35:49 +0000
commit6f8bfd148aeb387b9de3df0d4f36ba522236d941 (patch)
treee6062711b920ffb7c7006ba9a8405c7d2e8fb2bb /ext/standard/microtime.c
parenta24534a1ed1a38024fba0c5fe5374effb7432d0b (diff)
downloadphp-git-6f8bfd148aeb387b9de3df0d4f36ba522236d941.tar.gz
make microtime and gettimeofday unavailable instead of return false return
false in case needed library function is unavailable.
Diffstat (limited to 'ext/standard/microtime.c')
-rw-r--r--ext/standard/microtime.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/ext/standard/microtime.c b/ext/standard/microtime.c
index f5b1ab1578..efc1fd1c78 100644
--- a/ext/standard/microtime.c
+++ b/ext/standard/microtime.c
@@ -53,9 +53,9 @@
/* {{{ proto string microtime(void)
Returns a string containing the current time in seconds and microseconds */
+#ifdef HAVE_GETTIMEOFDAY
PHP_FUNCTION(microtime)
{
-#ifdef HAVE_GETTIMEOFDAY
struct timeval tp;
long sec = 0L;
double msec = 0.0;
@@ -68,17 +68,18 @@ PHP_FUNCTION(microtime)
if (msec >= 1.0) msec -= (long) msec;
snprintf(ret, 100, "%.8f %ld", msec, sec);
RETVAL_STRING(ret,1);
- } else
-#endif
+ } else {
RETURN_FALSE;
+ }
}
+#endif
/* }}} */
/* {{{ proto array gettimeofday(void)
Returns the current time as array */
+#ifdef HAVE_GETTIMEOFDAY
PHP_FUNCTION(gettimeofday)
{
-#ifdef HAVE_GETTIMEOFDAY
struct timeval tp;
struct timezone tz;
@@ -95,10 +96,11 @@ PHP_FUNCTION(gettimeofday)
#endif
add_assoc_long(return_value, "dsttime", tz.tz_dsttime);
return;
- } else
-#endif
- RETURN_FALSE;
+ } else {
+ RETURN_FALSE;
+ }
}
+#endif
/* }}} */
#ifdef HAVE_GETRUSAGE