cvs: php4(PHP_4_2_0) /ext/standard datetime.c
| From: | Jan Lehnardt | Date: | Mon, 22 Jul 2002 22:07:11 +0000 |
| Subject: | cvs: php4(PHP_4_2_0) /ext/standard datetime.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-12940@lists.php.net to get a copy of this message | ||
jan Mon Jul 22 18:07:11 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4/ext/standard datetime.c
Log:
- merge forgotten WS fix which makes non gcc compilers groan. (#17621)
Index: php4/ext/standard/datetime.c
diff -u php4/ext/standard/datetime.c:1.83 php4/ext/standard/datetime.c:1.83.2.1
--- php4/ext/standard/datetime.c:1.83 Mon Mar 4 06:11:25 2002
+++ php4/ext/standard/datetime.c Mon Jul 22 18:07:11 2002
@@ -19,7 +19,7 @@
*/
-/* $Id: datetime.c,v 1.83 2002/03/04 11:11:25 stas Exp $ */
+/* $Id: datetime.c,v 1.83.2.1 2002/07/22 22:07:11 jan Exp $ */
#include "php.h"
@@ -594,10 +594,10 @@
assoc_array = Z_LVAL_PP(assoc_array_arg);
break;
}
- if (NULL == (ta = php_localtime_r(×tamp, &tmbuf))) {
- php_error(E_WARNING, "%s(): invalid local time",
- get_active_function_name(TSRMLS_C));
- RETURN_FALSE;
+ if (NULL == (ta = php_localtime_r(×tamp, &tmbuf))) {
+ php_error(E_WARNING, "%s(): invalid local time",
+ get_active_function_name(TSRMLS_C));
+ RETURN_FALSE;
}
if (array_init(return_value) == FAILURE) {
php_error(E_ERROR, "Cannot prepare return array from localtime");