From 5f25a9114051b078696813628c37add0e15d88f2 Mon Sep 17 00:00:00 2001
From: Brad Smith <brad@comstyle.com>
Date: Sun, 16 Oct 2022 13:44:51 -0400
Subject: [PATCH] Cleanup the alloca.h header handling to further reduce
 hardcoded OS lists (#2289)

---
 include/mysql/service_encryption.h                       | 5 +++--
 plugin/cracklib_password_check/cracklib_password_check.c | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/mysql/service_encryption.h b/include/mysql/service_encryption.h
index a4e908f9aff..69d205a27e8 100644
--- a/include/mysql/service_encryption.h
+++ b/include/mysql/service_encryption.h
@@ -34,12 +34,13 @@ extern "C" {
 #ifndef __cplusplus
 #define inline __inline
 #endif
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-#include <stdlib.h>
 #else
+#include <stdlib.h>
+#ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
 #endif
+#endif
 
 /* returned from encryption_key_get_latest_version() */
 #define ENCRYPTION_KEY_VERSION_INVALID        (~(unsigned int)0)
diff --git a/plugin/cracklib_password_check/cracklib_password_check.c b/plugin/cracklib_password_check/cracklib_password_check.c
index 72f87db94da..55a1fd1c738 100644
--- a/plugin/cracklib_password_check/cracklib_password_check.c
+++ b/plugin/cracklib_password_check/cracklib_password_check.c
@@ -13,10 +13,10 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
+#include <my_global.h>
 #include <mysql/plugin_password_validation.h>
 #include <crack.h>
 #include <string.h>
-#include <alloca.h>
 #include <mysqld_error.h>
 
 static char *dictionary;