From 926ba0d9c738f15a5496f306ce65fd9cbb5974c4 Mon Sep 17 00:00:00 2001 From: Ulf Wendel Date: Mon, 4 Oct 2010 13:36:23 +0000 Subject: [PATCH] Trying to fix compiler warnings (on Windows). --- ext/mysql/php_mysql.c | 4 ++-- ext/mysqli/mysqli.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 42f4c1568e..6d013003c0 100644 --- 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 d49baf0d33..eabfa2f869 100644 --- 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 -- 2.40.0