tony2001 Wed Oct 12 09:31:48 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/mysqli mysqli.c mysqli_warning.c
Log:
fix TS build
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli.c?r1=1.72.2.3&r2=1.72.2.4&ty=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.3
php-src/ext/mysqli/mysqli.c:1.72.2.4
--- php-src/ext/mysqli/mysqli.c:1.72.2.3 Mon Oct 10 16:02:59 2005
+++ php-src/ext/mysqli/mysqli.c Wed Oct 12 09:31:46 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.72.2.3 2005/10/10 20:02:59 tony2001 Exp $
+ $Id: mysqli.c,v 1.72.2.4 2005/10/12 13:31:46 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -661,7 +661,7 @@
switch (ZEND_NUM_ARGS())
{
case 1: /* mysql_stmt_init */
- if (zend_parse_parameters(1, "O", &mysql_link,
mysqli_link_class_entry)==FAILURE) {
+ if (zend_parse_parameters(1 TSRMLS_CC, "O", &mysql_link,
mysqli_link_class_entry)==FAILURE) {
return;
}
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link,
"mysqli_link");
@@ -671,7 +671,7 @@
stmt->stmt = mysql_stmt_init(mysql->mysql);
break;
case 2:
- if (zend_parse_parameters(2, "Os", &mysql_link,
mysqli_link_class_entry, &statement, &stmt_len)==FAILURE) {
+ if (zend_parse_parameters(2 TSRMLS_CC, "Os", &mysql_link,
mysqli_link_class_entry, &statement, &stmt_len)==FAILURE) {
return;
}
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link,
"mysqli_link");
@@ -715,12 +715,12 @@
switch (ZEND_NUM_ARGS()) {
case 1:
- if (zend_parse_parameters(1, "O", &mysql_link,
mysqli_link_class_entry)==FAILURE) {
+ if (zend_parse_parameters(1 TSRMLS_CC, "O", &mysql_link,
mysqli_link_class_entry)==FAILURE) {
return;
}
break;
case 2:
- if (zend_parse_parameters(2, "Ol", &mysql_link,
mysqli_link_class_entry, &resmode)==FAILURE) {
+ if (zend_parse_parameters(2 TSRMLS_CC, "Ol", &mysql_link,
mysqli_link_class_entry, &resmode)==FAILURE) {
return;
}
break;
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_warning.c?r1=1.5.2.2&r2=1.5.2.3&ty=u
Index: php-src/ext/mysqli/mysqli_warning.c
diff -u php-src/ext/mysqli/mysqli_warning.c:1.5.2.2
php-src/ext/mysqli/mysqli_warning.c:1.5.2.3
--- php-src/ext/mysqli/mysqli_warning.c:1.5.2.2 Mon Oct 10 16:03:00 2005
+++ php-src/ext/mysqli/mysqli_warning.c Wed Oct 12 09:31:46 2005
@@ -175,7 +175,7 @@
if (ZEND_NUM_ARGS() != 1) {
WRONG_PARAM_COUNT;
}
- if (zend_parse_parameters(1, "o", &z)==FAILURE) {
+ if (zend_parse_parameters(1 TSRMLS_CC, "o", &z)==FAILURE) {
return;
}
obj = (mysqli_object *)zend_object_store_get_object(z TSRMLS_CC);\
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php