summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichaelld <michaelld@221aa14e-8319-0410-a670-987f0aec2ac5>2009-02-18 15:18:23 +0000
committermichaelld <michaelld@221aa14e-8319-0410-a670-987f0aec2ac5>2009-02-18 15:18:23 +0000
commit5d1b71031124406721a701c259c12392cd52c4aa (patch)
treeacdaf62246d286c544793c616eddaa7487d12d77
parent14e59a3bedfdbd2835c3053cb0be26131bafb9d1 (diff)
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
-rw-r--r--configure.ac2
-rw-r--r--gnuradio-core/src/lib/missing/posix_memalign.cc6
2 files changed, 6 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 62844c65bf..3e3cbd5464 100644
--- 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 a1a707ae5f..a2e98b018b 100644
--- 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