uw Mon, 04 Oct 2010 13:36:23 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=304016
Log:
Trying to fix compiler warnings (on Windows).
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c
U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c
U php/php-src/trunk/ext/mysql/php_mysql.c
U php/php-src/trunk/ext/mysqli/mysqli.c
Modified: php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c 2010-10-04 13:36:06 UTC
(rev 304015)
+++ php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c 2010-10-04 13:36:23 UTC
(rev 304016)
@@ -637,7 +637,7 @@
efree(MySG(connect_error));
}
-#ifdef A0 && MYSQL_USE_MYSQLND
+#if defined(A0) && MYSQL_USE_MYSQLND
zend_hash_apply(&EG(persistent_list), (apply_func_t)
php_mysql_persistent_helper TSRMLS_CC);
#endif
@@ -888,7 +888,7 @@
mysql->multi_query = 0;
#endif
/* ensure that the link did not die */
-#if A0 && defined(MYSQL_USE_MYSQLND)
+#if defined(A0) && MYSQL_USE_MYSQLND
mysqlnd_end_psession(mysql->conn);
#endif
if (mysql_ping(mysql->conn)) {
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c 2010-10-04 13:36:06 UTC
(rev 304015)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c 2010-10-04 13:36:23 UTC
(rev 304016)
@@ -893,7 +893,7 @@
if (MyG(error_msg)) {
efree(MyG(error_msg));
}
-#ifdef A0 && MYSQLI_USE_MYSQLND
+#if defined(A0) && MYSQLI_USE_MYSQLND
/* psession is being called when the connection is freed - explicitly
or implicitly */
zend_hash_apply(&EG(persistent_list), (apply_func_t)
php_mysqli_persistent_helper_once TSRMLS_CC);
#endif
Modified: php/php-src/trunk/ext/mysql/php_mysql.c
===================================================================
--- php/php-src/trunk/ext/mysql/php_mysql.c 2010-10-04 13:36:06 UTC (rev
304015)
+++ php/php-src/trunk/ext/mysql/php_mysql.c 2010-10-04 13:36:23 UTC (rev
304016)
@@ -637,7 +637,7 @@
efree(MySG(connect_error));
}
-#ifdef A0 && MYSQL_USE_MYSQLND
+#if defined(A0) && MYSQL_USE_MYSQLND
zend_hash_apply(&EG(persistent_list), (apply_func_t)
php_mysql_persistent_helper TSRMLS_CC);
#endif
@@ -888,7 +888,7 @@
mysql->multi_query = 0;
#endif
/* ensure that the link did not die */
-#if A0 && defined(MYSQL_USE_MYSQLND)
+#if defined(A0) && MYSQL_USE_MYSQLND
mysqlnd_end_psession(mysql->conn);
#endif
if (mysql_ping(mysql->conn)) {
Modified: php/php-src/trunk/ext/mysqli/mysqli.c
===================================================================
--- php/php-src/trunk/ext/mysqli/mysqli.c 2010-10-04 13:36:06 UTC (rev
304015)
+++ php/php-src/trunk/ext/mysqli/mysqli.c 2010-10-04 13:36:23 UTC (rev
304016)
@@ -895,7 +895,7 @@
if (MyG(error_msg)) {
efree(MyG(error_msg));
}
-#ifdef A0 && MYSQLI_USE_MYSQLND
+#if defined(A0) && MYSQLI_USE_MYSQLND
/* psession is being called when the connection is freed - explicitly
or implicitly */
zend_hash_apply(&EG(persistent_list), (apply_func_t)
php_mysqli_persistent_helper_once TSRMLS_CC);
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
