Include malloc.h if available, also when compiling with gcc.

diff --git a/ChangeLog b/ChangeLog
index 86d69fe79f62b53da83c518fb19c8d4113c40e0b..d021b322c9dd26016270f45aabb7c621896e231c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-07-03  Niels Möller  <nisse@lysator.liu.se>
 
+       * aclocal.m4 (LSH_FUNC_ALLOCA): In the config.h boilerplate,
+       include malloc.h if it exists, also when compiling with gcc.
+       Needed for cross-compiling with --host=i586-mingw32msvc.
+
        * examples/base16dec.c: Don't #include files using <nettle/...>,
        we don't want to pick up installed versions.
        * examples/base16enc.c: Likewise.

diff --git a/aclocal.m4 b/aclocal.m4
index d2915e9e7870cfced8dd73f3c2026fe5fe936e46..a94c20d308384688e38d8c608c626ddfa2ee66b5 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -369,6 +369,11 @@ char *alloca ();
 #else /* defined __GNUC__ */
 # if HAVE_ALLOCA_H
 #  include <alloca.h>
+# else
+/* Needed for alloca on windows, also with gcc */
+#  if HAVE_MALLOC_H
+#   include <malloc.h>
+#  endif
 # endif
 #endif
 ])])