svn: /php/php-src/ branches/PHP_5_3/ext/mysql/php_mysql.c branches/PHP_5_4/ext/mysql/php_mysql.c trunk/ext/mysql/php_mysql.c
| From: | Andrey Hristov | Date: | Tue, 02 Aug 2011 14:18:56 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/ext/mysql/php_mysql.c branches/PHP_5_4/ext/mysql/php_mysql.c trunk/ext/mysql/php_mysql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-65681@lists.php.net to get a copy of this message | ||
andrey Tue, 02 Aug 2011 14:18:56 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=314109
Log:
completely compile out a currently non-needed function
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c
U php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c
U php/php-src/trunk/ext/mysql/php_mysql.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 2011-08-02 14:10:28 UTC (rev 314108)
+++ php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c 2011-08-02 14:18:56 UTC (rev 314109)
@@ -608,7 +608,7 @@
/* }}} */
-#ifdef MYSQL_USE_MYSQLND
+#if defined(A0) && defined(MYSQL_USE_MYSQLND)
static int php_mysql_persistent_helper(zend_rsrc_list_entry *le TSRMLS_DC)
{
if (le->type == le_plink) {
@@ -637,7 +637,7 @@
efree(MySG(connect_error));
}
-#if defined(A0) && MYSQL_USE_MYSQLND
+#if defined(A0) && defined(MYSQL_USE_MYSQLND)
zend_hash_apply(&EG(persistent_list), (apply_func_t) php_mysql_persistent_helper TSRMLS_CC);
#endif
Modified: php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c 2011-08-02 14:10:28 UTC (rev 314108)
+++ php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c 2011-08-02 14:18:56 UTC (rev 314109)
@@ -608,7 +608,7 @@
/* }}} */
-#ifdef MYSQL_USE_MYSQLND
+#if defined(A0) && defined(MYSQL_USE_MYSQLND)
static int php_mysql_persistent_helper(zend_rsrc_list_entry *le TSRMLS_DC)
{
if (le->type == le_plink) {
@@ -637,7 +637,7 @@
efree(MySG(connect_error));
}
-#if defined(A0) && MYSQL_USE_MYSQLND
+#if defined(A0) && defined(MYSQL_USE_MYSQLND)
zend_hash_apply(&EG(persistent_list), (apply_func_t) php_mysql_persistent_helper TSRMLS_CC);
#endif
Modified: php/php-src/trunk/ext/mysql/php_mysql.c
===================================================================
--- php/php-src/trunk/ext/mysql/php_mysql.c 2011-08-02 14:10:28 UTC (rev 314108)
+++ php/php-src/trunk/ext/mysql/php_mysql.c 2011-08-02 14:18:56 UTC (rev 314109)
@@ -608,7 +608,7 @@
/* }}} */
-#ifdef MYSQL_USE_MYSQLND
+#if defined(A0) && defined(MYSQL_USE_MYSQLND)
static int php_mysql_persistent_helper(zend_rsrc_list_entry *le TSRMLS_DC)
{
if (le->type == le_plink) {
@@ -637,7 +637,7 @@
efree(MySG(connect_error));
}
-#if defined(A0) && MYSQL_USE_MYSQLND
+#if defined(A0) && defined(MYSQL_USE_MYSQLND)
zend_hash_apply(&EG(persistent_list), (apply_func_t) php_mysql_persistent_helper TSRMLS_CC);
#endif