cvs: /php3/functions microtime.c
| From: | Sascha Schumann | Date: | Tue, 21 Sep 1999 08:23:25 +0000 |
| Subject: | cvs: /php3/functions microtime.c | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-11125@lists.php.net to get a copy of this message | ||
sas Tue Sep 21 04:23:25 1999 EDT
Modified files:
/php3/functions microtime.c
Log:
Merge in PHP4 changes
Index: php3/functions/microtime.c
diff -u php3/functions/microtime.c:1.31 php3/functions/microtime.c:1.32
--- php3/functions/microtime.c:1.31 Wed Jun 16 07:34:21 1999
+++ php3/functions/microtime.c Tue Sep 21 04:23:25 1999
@@ -27,7 +27,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: microtime.c,v 1.31 1999/06/16 11:34:21 ssb Exp $ */
+/* $Id: microtime.c,v 1.32 1999/09/21 08:23:25 sas Exp $ */
#include "php.h"
#include <stdlib.h>
@@ -81,6 +81,7 @@
msec = (double) (tp.tv_usec / MICRO_IN_SEC);
sec = tp.tv_sec;
}
+ if (msec > 1.0) msec -= (long) msec;
snprintf(ret, 100, "%.8f %ld", msec, sec);
RETVAL_STRING(ret,1);
#endif