svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/mysqli.c branches/PHP_5_4/ext/mysqli/mysqli.c trunk/ext/mysqli/mysqli.c
| From: | Andrey Hristov | Date: | Tue, 02 Aug 2011 14:02:21 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/mysqli.c branches/PHP_5_4/ext/mysqli/mysqli.c trunk/ext/mysqli/mysqli.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-65680@lists.php.net to get a copy of this message | ||
andrey Tue, 02 Aug 2011 14:02:21 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=314106
Log:
compile out both parts of the code that are currently unused - fixes a compilation warning
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c
U php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c
U php/php-src/trunk/ext/mysqli/mysqli.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c 2011-08-02 13:59:57 UTC (rev 314105)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c 2011-08-02 14:02:21 UTC (rev 314106)
@@ -865,7 +865,7 @@
}
/* }}} */
-#ifdef MYSQLI_USE_MYSQLND
+#if defined(A0) && defined(MYSQLI_USE_MYSQLND)
static void php_mysqli_persistent_helper_for_every(void *p)
{
TSRMLS_FETCH();
@@ -896,7 +896,7 @@
if (MyG(error_msg)) {
efree(MyG(error_msg));
}
-#if defined(A0) && MYSQLI_USE_MYSQLND
+#if defined(A0) && defined(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/branches/PHP_5_4/ext/mysqli/mysqli.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c 2011-08-02 13:59:57 UTC (rev 314105)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c 2011-08-02 14:02:21 UTC (rev 314106)
@@ -867,7 +867,7 @@
}
/* }}} */
-#ifdef MYSQLI_USE_MYSQLND
+#if defined(A0) && defined(MYSQLI_USE_MYSQLND)
static void php_mysqli_persistent_helper_for_every(void *p)
{
TSRMLS_FETCH();
@@ -898,7 +898,7 @@
if (MyG(error_msg)) {
efree(MyG(error_msg));
}
-#if defined(A0) && MYSQLI_USE_MYSQLND
+#if defined(A0) && defined(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/mysqli/mysqli.c
===================================================================
--- php/php-src/trunk/ext/mysqli/mysqli.c 2011-08-02 13:59:57 UTC (rev 314105)
+++ php/php-src/trunk/ext/mysqli/mysqli.c 2011-08-02 14:02:21 UTC (rev 314106)
@@ -867,7 +867,7 @@
}
/* }}} */
-#ifdef MYSQLI_USE_MYSQLND
+#if defined(A0) && defined(MYSQLI_USE_MYSQLND)
static void php_mysqli_persistent_helper_for_every(void *p)
{
TSRMLS_FETCH();
@@ -898,7 +898,7 @@
if (MyG(error_msg)) {
efree(MyG(error_msg));
}
-#if defined(A0) && MYSQLI_USE_MYSQLND
+#if defined(A0) && defined(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