Refactor

We now can simplify `SETUP_ZLIB_LIB()`, and clean up formatting.

Author: cmb69

ext/mysqlnd/config.w32

@@ -30,8 +30,7 @@ if (PHP_MYSQLND != "no") {
 		EXTENSION("mysqlnd", mysqlnd_source, false, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
 		if (SETUP_ZLIB_LIB("mysqlnd", PHP_MYSQLND) &&
 			CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS", "..\\zlib;" + php_usual_include_suspects)
-			)
-		{
+		) {
 			AC_DEFINE("MYSQLND_COMPRESSION_ENABLED", 1, "Define to 1 if mysqlnd has compressed protocol support.");
 			AC_DEFINE("MYSQLND_SSL_SUPPORTED", 1, "Define to 1 if mysqlnd core SSL is enabled.");
 			if (CHECK_LIB("crypt32.lib", "mysqlnd")) {

win32/build/confutils.js

@@ -3628,9 +3628,8 @@ function ADD_MAKEFILE_FRAGMENT(src_file)
 
 function SETUP_ZLIB_LIB(target, path_to_check)
 {
-	return ((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", target, path_to_check))) ||
-		(PHP_ZLIB_SHARED && CHECK_LIB("zlib_a.lib;zlib.lib", target, path_to_check)) ||
-		(PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED));
+	return ((PHP_ZLIB == "no" || PHP_ZLIB_SHARED) && CHECK_LIB("zlib_a.lib;zlib.lib", target, path_to_check)) ||
+		(PHP_ZLIB == "yes" && !PHP_ZLIB_SHARED);
 }
 
 function SETUP_OPENSSL(target, path_to_check, common_name, use_env, add_dir_part, add_to_flag_only)