Merging in branch to add malloc.h to posix_memalign.cc for Cygwin.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10461 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/configure.ac b/configure.ac
index 62844c65bfdbf766b9c445f24a06f1e6ca492011..3e3cbd54640afdd8c690814aec169bd7db94633b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -125,7 +125,7 @@ AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(fcntl.h limits.h strings.h time.h sys/ioctl.h sys/time.h unistd.h)
 AC_CHECK_HEADERS(linux/ppdev.h dev/ppbus/ppi.h sys/mman.h sys/select.h sys/types.h)
-AC_CHECK_HEADERS(sys/resource.h stdint.h sched.h signal.h sys/syscall.h)
+AC_CHECK_HEADERS(sys/resource.h stdint.h sched.h signal.h sys/syscall.h malloc.h)
 AC_CHECK_HEADERS(netinet/in.h)
 AC_CHECK_HEADERS(windows.h)
 AC_CHECK_HEADERS(vec_types.h)

diff --git a/gnuradio-core/src/lib/missing/posix_memalign.cc b/gnuradio-core/src/lib/missing/posix_memalign.cc
index a1a707ae5fea0960e7ccb43c10b414cf3318de20..a2e98b018b63eac4f453683d7cb1f7d461655383 100644 (file)
--- a/gnuradio-core/src/lib/missing/posix_memalign.cc
+++ b/gnuradio-core/src/lib/missing/posix_memalign.cc
@@ -25,7 +25,11 @@
 #endif
 
 #include "posix_memalign.h"
-#include <stdlib.h>
+
+#ifdef HAVE_MALLOC_H
+// for Cygwin valloc () prototype
+#include <malloc.h>
+#endif
 
 #ifndef HAVE_POSIX_MEMALIGN