[Commit-gnuradio] r10484 - in gnuradio/branches/releases/3.2: . gnuradio-core/src/lib/missing

[jcorgan]

Author: jcorgan
Date: 2009-02-23 15:03:22 -0700 (Mon, 23 Feb 2009)
New Revision: 10484

Modified:
   gnuradio/branches/releases/3.2/configure.ac
   
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/missing/posix_memalign.cc
Log:
Merged r10410, r10417 and r10461 from trunk into release 3.2 branch

Modified: gnuradio/branches/releases/3.2/configure.ac
===================================================================
--- gnuradio/branches/releases/3.2/configure.ac 2009-02-23 19:39:07 UTC (rev 
10483)
+++ gnuradio/branches/releases/3.2/configure.ac 2009-02-23 22:03:22 UTC (rev 
10484)
@@ -125,7 +125,7 @@
 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)

Modified: 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/missing/posix_memalign.cc
===================================================================
--- 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/missing/posix_memalign.cc  
    2009-02-23 19:39:07 UTC (rev 10483)
+++ 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/missing/posix_memalign.cc  
    2009-02-23 22:03:22 UTC (rev 10484)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,6 +26,11 @@
 
 #include "posix_memalign.h"
 
+#ifdef HAVE_MALLOC_H
+// for Cygwin valloc () prototype
+#include <malloc.h>
+#endif
+
 #ifndef HAVE_POSIX_MEMALIGN
 
 /* emulate posix_memalign functionality, to some degree */