[PHP-CVS] com php-src: - Fixed ZTS build: ext/date/php_date.c
Commit:7629c8db401b3695348d26c0785c9ab4b7e6ebb1
Author:Felipe Pena felipe...@gmail.com Tue, 15 Jan 2013 19:45:09
-0200
Parents: 85a949d9d4c5b216d6581f62df6b7d5b4787c130
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=7629c8db401b3695348d26c0785c9ab4b7e6ebb1
Log:
- Fixed ZTS build
Changed paths:
M ext/date/php_date.c
Diff:
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index cc83130..54dc2f5 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -2066,12 +2066,12 @@ static zend_object_value date_object_clone_date(zval
*this_ptr TSRMLS_DC)
return new_ov;
}
-static zval* date_clone_immutable(zval *object)
+static zval* date_clone_immutable(zval *object TSRMLS_DC)
{
zval *new_object;
ALLOC_ZVAL(new_object);
- Z_OBJVAL_P(new_object) = date_object_clone_date(object);
+ Z_OBJVAL_P(new_object) = date_object_clone_date(object TSRMLS_CC);
Z_SET_REFCOUNT_P(new_object, 1);
Z_SET_ISREF_P(new_object);
Z_TYPE_P(new_object) = IS_OBJECT;
@@ -2970,7 +2970,7 @@ PHP_METHOD(DateTimeImmutable, modify)
RETURN_FALSE;
}
- new_object = date_clone_immutable(object);
+ new_object = date_clone_immutable(object TSRMLS_CC);
php_date_modify(new_object, modify, modify_len, return_value TSRMLS_CC);
RETURN_ZVAL(new_object, 0, 1);
@@ -3037,7 +3037,7 @@ PHP_METHOD(DateTimeImmutable, add)
RETURN_FALSE;
}
- new_object = date_clone_immutable(object);
+ new_object = date_clone_immutable(object TSRMLS_CC);
php_date_add(new_object, interval, return_value TSRMLS_CC);
RETURN_ZVAL(new_object, 0, 1);
@@ -3107,7 +3107,7 @@ PHP_METHOD(DateTimeImmutable, sub)
RETURN_FALSE;
}
- new_object = date_clone_immutable(object);
+ new_object = date_clone_immutable(object TSRMLS_CC);
php_date_sub(new_object, interval, return_value TSRMLS_CC);
RETURN_ZVAL(new_object, 0, 1);
@@ -3197,7 +3197,7 @@ PHP_METHOD(DateTimeImmutable, setTimezone)
RETURN_FALSE;
}
- new_object = date_clone_immutable(object);
+ new_object = date_clone_immutable(object TSRMLS_CC);
php_date_timezone_set(new_object, timezone_object, return_value
TSRMLS_CC);
RETURN_ZVAL(new_object, 0, 1);
@@ -3280,7 +3280,7 @@ PHP_METHOD(DateTimeImmutable, setTime)
RETURN_FALSE;
}
- new_object = date_clone_immutable(object);
+ new_object = date_clone_immutable(object TSRMLS_CC);
php_date_time_set(new_object, h, i, s, return_value TSRMLS_CC);
RETURN_ZVAL(new_object, 0, 1);
@@ -3328,7 +3328,7 @@ PHP_METHOD(DateTimeImmutable, setDate)
RETURN_FALSE;
}
- new_object = date_clone_immutable(object);
+ new_object = date_clone_immutable(object TSRMLS_CC);
php_date_date_set(new_object, y, m, d, return_value TSRMLS_CC);
RETURN_ZVAL(new_object, 0, 1);
@@ -3380,7 +3380,7 @@ PHP_METHOD(DateTimeImmutable, setISODate)
RETURN_FALSE;
}
- new_object = date_clone_immutable(object);
+ new_object = date_clone_immutable(object TSRMLS_CC);
php_date_isodate_set(new_object, y, w, d, return_value TSRMLS_CC);
RETURN_ZVAL(new_object, 0, 1);
@@ -3426,7 +3426,7 @@ PHP_METHOD(DateTimeImmutable, setTimestamp)
RETURN_FALSE;
}
- new_object = date_clone_immutable(object);
+ new_object = date_clone_immutable(object TSRMLS_CC);
php_date_timestamp_set(new_object, timestamp, return_value TSRMLS_CC);
RETURN_ZVAL(new_object, 0, 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: - Fixed ZTS build: ext/date/php_date.c
Commit:2f7aafe9929d843ae089a7072c5e6d9bd70c77ae
Author:Felipe Pena felipe...@gmail.com Tue, 15 Jan 2013 19:59:23
-0200
Parents: 18e160411e364ee02eff12e8ab516be9911be393
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=2f7aafe9929d843ae089a7072c5e6d9bd70c77ae
Log:
- Fixed ZTS build
Changed paths:
M ext/date/php_date.c
Diff:
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index cc83130..54dc2f5 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -2066,12 +2066,12 @@ static zend_object_value date_object_clone_date(zval
*this_ptr TSRMLS_DC)
return new_ov;
}
-static zval* date_clone_immutable(zval *object)
+static zval* date_clone_immutable(zval *object TSRMLS_DC)
{
zval *new_object;
ALLOC_ZVAL(new_object);
- Z_OBJVAL_P(new_object) = date_object_clone_date(object);
+ Z_OBJVAL_P(new_object) = date_object_clone_date(object TSRMLS_CC);
Z_SET_REFCOUNT_P(new_object, 1);
Z_SET_ISREF_P(new_object);
Z_TYPE_P(new_object) = IS_OBJECT;
@@ -2970,7 +2970,7 @@ PHP_METHOD(DateTimeImmutable, modify)
RETURN_FALSE;
}
- new_object = date_clone_immutable(object);
+ new_object = date_clone_immutable(object TSRMLS_CC);
php_date_modify(new_object, modify, modify_len, return_value TSRMLS_CC);
RETURN_ZVAL(new_object, 0, 1);
@@ -3037,7 +3037,7 @@ PHP_METHOD(DateTimeImmutable, add)
RETURN_FALSE;
}
- new_object = date_clone_immutable(object);
+ new_object = date_clone_immutable(object TSRMLS_CC);
php_date_add(new_object, interval, return_value TSRMLS_CC);
RETURN_ZVAL(new_object, 0, 1);
@@ -3107,7 +3107,7 @@ PHP_METHOD(DateTimeImmutable, sub)
RETURN_FALSE;
}
- new_object = date_clone_immutable(object);
+ new_object = date_clone_immutable(object TSRMLS_CC);
php_date_sub(new_object, interval, return_value TSRMLS_CC);
RETURN_ZVAL(new_object, 0, 1);
@@ -3197,7 +3197,7 @@ PHP_METHOD(DateTimeImmutable, setTimezone)
RETURN_FALSE;
}
- new_object = date_clone_immutable(object);
+ new_object = date_clone_immutable(object TSRMLS_CC);
php_date_timezone_set(new_object, timezone_object, return_value
TSRMLS_CC);
RETURN_ZVAL(new_object, 0, 1);
@@ -3280,7 +3280,7 @@ PHP_METHOD(DateTimeImmutable, setTime)
RETURN_FALSE;
}
- new_object = date_clone_immutable(object);
+ new_object = date_clone_immutable(object TSRMLS_CC);
php_date_time_set(new_object, h, i, s, return_value TSRMLS_CC);
RETURN_ZVAL(new_object, 0, 1);
@@ -3328,7 +3328,7 @@ PHP_METHOD(DateTimeImmutable, setDate)
RETURN_FALSE;
}
- new_object = date_clone_immutable(object);
+ new_object = date_clone_immutable(object TSRMLS_CC);
php_date_date_set(new_object, y, m, d, return_value TSRMLS_CC);
RETURN_ZVAL(new_object, 0, 1);
@@ -3380,7 +3380,7 @@ PHP_METHOD(DateTimeImmutable, setISODate)
RETURN_FALSE;
}
- new_object = date_clone_immutable(object);
+ new_object = date_clone_immutable(object TSRMLS_CC);
php_date_isodate_set(new_object, y, w, d, return_value TSRMLS_CC);
RETURN_ZVAL(new_object, 0, 1);
@@ -3426,7 +3426,7 @@ PHP_METHOD(DateTimeImmutable, setTimestamp)
RETURN_FALSE;
}
- new_object = date_clone_immutable(object);
+ new_object = date_clone_immutable(object TSRMLS_CC);
php_date_timestamp_set(new_object, timestamp, return_value TSRMLS_CC);
RETURN_ZVAL(new_object, 0, 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
