cvs: php-src /ext/standard array.c
| From: | Dmitry Stogov | Date: | Fri, 19 Aug 2005 07:49:45 +0000 |
| Subject: | cvs: php-src /ext/standard array.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-33556@lists.php.net to get a copy of this message | ||
dmitry Fri Aug 19 03:49:45 2005 EDT
Modified files:
/php-src/ext/standard array.c
Log:
ZTS fix
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.319&r2=1.320&ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.319 php-src/ext/standard/array.c:1.320
--- php-src/ext/standard/array.c:1.319 Fri Aug 19 03:26:13 2005
+++ php-src/ext/standard/array.c Fri Aug 19 03:49:41 2005
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.319 2005/08/19 07:26:13 dmitry Exp $ */
+/* $Id: array.c,v 1.320 2005/08/19 07:49:41 dmitry Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -1732,7 +1732,7 @@
}
/* Unify types */
- str_type = zend_get_unified_string_type(2, Z_TYPE_P(zlow), Z_TYPE_P(zhigh));
+ str_type = zend_get_unified_string_type(2 TSRMLS_CC, Z_TYPE_P(zlow), Z_TYPE_P(zhigh));
if (str_type == (zend_uchar)-1) {
zend_error(E_WARNING, "Cannot mix binary and Unicode parameters");
return;