From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 4 Jun 2020 08:03:39 +0000 (+0200)
Subject: Remove MYSQLND_COMPRESSION_WANTED define
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4984bd100bd53ec09b73e9e69df8baff3ea1503e;p=php

Remove MYSQLND_COMPRESSION_WANTED define

Instead directly define MYSQLND_COMPRESSION_ENABLED. This also
matches what config.w32 does.
---

diff --git a/ext/mysqlnd/config9.m4 b/ext/mysqlnd/config9.m4
index 5c01ed762f..188023cbb5 100644
--- a/ext/mysqlnd/config9.m4
+++ b/ext/mysqlnd/config9.m4
@@ -27,7 +27,7 @@ if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then
     PKG_CHECK_MODULES([ZLIB], [zlib])
     PHP_EVAL_LIBLINE($ZLIB_LIBS, MYSQLND_SHARED_LIBADD)
     PHP_EVAL_INCLINE($ZLIB_CFLAGS)
-    AC_DEFINE([MYSQLND_COMPRESSION_WANTED], 1, [Enable compressed protocol support])
+    AC_DEFINE([MYSQLND_COMPRESSION_ENABLED], 1, [Enable compressed protocol support])
   fi
 
   AC_DEFINE([MYSQLND_SSL_SUPPORTED], 1, [Enable core mysqlnd SSL code])
diff --git a/ext/mysqlnd/mysqlnd.h b/ext/mysqlnd/mysqlnd.h
index d052bdbe89..b21c227c51 100644
--- a/ext/mysqlnd/mysqlnd.h
+++ b/ext/mysqlnd/mysqlnd.h
@@ -46,10 +46,6 @@
 #define MYSQLND_DBG_ENABLED 0
 #endif
 
-#if defined(MYSQLND_COMPRESSION_WANTED)
-#define MYSQLND_COMPRESSION_ENABLED 1
-#endif
-
 #ifdef ZTS
 #include "TSRM.h"
 #endif