dmitry Mon Sep 25 06:59:02 2006 UTC
Modified files:
/php-src/ext/standard dns.c math.c
Log:
ZTS fix
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.81&r2=1.82&diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.81 php-src/ext/standard/dns.c:1.82
--- php-src/ext/standard/dns.c:1.81 Mon Sep 25 02:27:24 2006
+++ php-src/ext/standard/dns.c Mon Sep 25 06:59:02 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dns.c,v 1.81 2006/09/25 02:27:24 pollita Exp $ */
+/* $Id: dns.c,v 1.82 2006/09/25 06:59:02 dmitry Exp $ */
/* {{{ includes */
#include "php.h"
@@ -370,7 +370,7 @@
#endif
/* {{{ php_parserr */
-static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch,
int store, zval **subarray)
+static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch,
int store, zval **subarray TSRMLS_DC)
{
u_short type, class, dlen;
u_long ttl;
@@ -781,7 +781,7 @@
while (an-- && cp && cp < end) {
zval *retval;
- cp = php_parserr(cp, &answer, type_to_fetch,
store_results, &retval);
+ cp = php_parserr(cp, &answer, type_to_fetch,
store_results, &retval TSRMLS_CC);
if (retval != NULL && store_results) {
add_next_index_zval(return_value,
retval);
}
@@ -798,7 +798,7 @@
while (ns-- > 0 && cp && cp < end) {
zval *retval = NULL;
- cp = php_parserr(cp, &answer, DNS_T_ANY, authns !=
NULL, &retval);
+ cp = php_parserr(cp, &answer, DNS_T_ANY, authns !=
NULL, &retval TSRMLS_CC);
if (retval != NULL) {
add_next_index_zval(authns, retval);
}
@@ -810,7 +810,7 @@
while (ar-- > 0 && cp && cp < end) {
zval *retval = NULL;
- cp = php_parserr(cp, &answer, DNS_T_ANY, 1, &retval);
+ cp = php_parserr(cp, &answer, DNS_T_ANY, 1, &retval
TSRMLS_CC);
if (retval != NULL) {
add_next_index_zval(addtl, retval);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/math.c?r1=1.137&r2=1.138&diff_format=u
Index: php-src/ext/standard/math.c
diff -u php-src/ext/standard/math.c:1.137 php-src/ext/standard/math.c:1.138
--- php-src/ext/standard/math.c:1.137 Sun Sep 24 17:59:40 2006
+++ php-src/ext/standard/math.c Mon Sep 25 06:59:02 2006
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: math.c,v 1.137 2006/09/24 17:59:40 pollita Exp $ */
+/* $Id: math.c,v 1.138 2006/09/25 06:59:02 dmitry Exp $ */
#include "php.h"
#include "php_math.h"
@@ -59,7 +59,7 @@
return;
}
- convert_scalar_to_number(value);
+ convert_scalar_to_number(value TSRMLS_CC);
if (Z_TYPE_P(value) == IS_DOUBLE) {
RETURN_DOUBLE(fabs(Z_DVAL_P(value)));
@@ -84,7 +84,7 @@
return;
}
- convert_scalar_to_number(value);
+ convert_scalar_to_number(value TSRMLS_CC);
if (Z_TYPE_P(value) == IS_DOUBLE) {
RETURN_DOUBLE(ceil(Z_DVAL_P(value)));
@@ -106,7 +106,7 @@
return;
}
- convert_scalar_to_number(value);
+ convert_scalar_to_number(value TSRMLS_CC);
if (Z_TYPE_P(value) == IS_DOUBLE) {
RETURN_DOUBLE(floor(Z_DVAL_P(value)));
@@ -130,7 +130,7 @@
return;
}
- convert_scalar_to_number(value);
+ convert_scalar_to_number(value TSRMLS_CC);
switch (Z_TYPE_P(value)) {
case IS_LONG:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
