compile out both parts of the code that are currently unused - fixes a compilation warning

faizshukri · faizshukri · commit a884bbf1e981 · 2011-08-02T14:02:21.000Z
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
@@ -867,7 +867,7 @@ PHP_RINIT_FUNCTION(mysqli)
 }
 /* }}} */
 
-#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 @@ PHP_RSHUTDOWN_FUNCTION(mysqli)
 	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

Original file line number	Diff line number	Diff line change
`@@ -867,7 +867,7 @@ PHP_RINIT_FUNCTION(mysqli)`
`867`	`867`	`}`
`868`	`868`	`/* }}} */`
`869`	`869`
`870`		`-#ifdef MYSQLI_USE_MYSQLND`
	`870`	`+#if defined(A0) && defined(MYSQLI_USE_MYSQLND)`
`871`	`871`	`static void php_mysqli_persistent_helper_for_every(void *p)`
`872`	`872`	`{`
`873`	`873`	`TSRMLS_FETCH();`
`@@ -898,7 +898,7 @@ PHP_RSHUTDOWN_FUNCTION(mysqli)`
`898`	`898`	`if (MyG(error_msg)) {`
`899`	`899`	`efree(MyG(error_msg));`
`900`	`900`	`}`
`901`		`-#if defined(A0) && MYSQLI_USE_MYSQLND`
	`901`	`+#if defined(A0) && defined(MYSQLI_USE_MYSQLND)`
`902`	`902`	`/* psession is being called when the connection is freed - explicitly or implicitly */`
`903`	`903`	`zend_hash_apply(&EG(persistent_list), (apply_func_t) php_mysqli_persistent_helper_once TSRMLS_CC);`
`904`	`904`	`#endif`