Trying to fix compiler warnings (on Windows).

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 42f4c1568e487de6153bfa2fec33b2a5d5c7ac7c..6d013003c034b28ab3f4a58540d2102ad23260b2 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -637,7 +637,7 @@ PHP_RSHUTDOWN_FUNCTION(mysql)
                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 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
                        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)) {

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index d49baf0d336267932c80e7f9b97179bdbc4a1260..eabfa2f8691fe5e1ce34095a681ca3bd81512079 100644 (file)
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -895,7 +895,7 @@ PHP_RSHUTDOWN_FUNCTION(mysqli)
        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