From: Michael Wallner <mike@php.net>
Date: Fri, 27 Nov 2020 16:24:39 +0000 (+0100)
Subject: fix alloca usage
X-Git-Tag: 1.1.0-beta1~84
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=80b3a1478d13fcf2ddae6e2b759cfb49f002f96d;p=m6w6%2Flibmemcached

fix alloca usage
---

diff --git a/CMake/_Include.cmake b/CMake/_Include.cmake
index 6a5598d9..7c1b546d 100644
--- a/CMake/_Include.cmake
+++ b/CMake/_Include.cmake
@@ -115,7 +115,7 @@ configure_set(HAVE_FNV64_HASH ${ENABLE_HASH_FNV64})
 configure_set(HAVE_MURMUR_HASH ${ENABLE_HASH_MURMUR})
 configure_set(HAVE_HSIEH_HASH ${ENABLE_HASH_HSIEH})
 
-# most of the following checks are due to mingw or msvc; see gnulib
+check_include(alloca.h)
 check_include(arpa/inet.h)
 check_include(dlfcn.h)
 check_include(netdb.h)
diff --git a/src/libmemcached/assert.hpp b/src/libmemcached/assert.hpp
index 4088c0f1..abad23d1 100644
--- a/src/libmemcached/assert.hpp
+++ b/src/libmemcached/assert.hpp
@@ -36,12 +36,18 @@
 
 #  ifdef __cplusplus
 #    include <cstdarg>
+#    include <cstdlib>
 #    include <cstdio>
 #  else
 #    include <stdarg.h>
+#    include <stdlib.h>
 #    include <stdio.h>
 #  endif
 
+#  ifdef HAVE_ALLOCA_H
+#    include <alloca.h>
+#  endif
+
 #  include "libmemcached/backtrace.hpp"
 
 #  define assert_msg(__expr, __mesg) \
diff --git a/src/libmemcachedutil/pool.cc b/src/libmemcachedutil/pool.cc
index c2185141..7a601d13 100644
--- a/src/libmemcachedutil/pool.cc
+++ b/src/libmemcachedutil/pool.cc
@@ -15,7 +15,6 @@
 
 #include "libmemcachedutil/common.h"
 
-#include <alloca.h>
 #include <cassert>
 #include <cerrno>
 #include <cstring>