[Discuss-gnuradio] Re: [Commit-gnuradio] r10410 - gnuradio/trunk/gnuradio-core/src/lib/missing

[Michael Dickens]

> Fix missing header include (Don Ward)
>
> Modified: gnuradio/trunk/gnuradio-core/src/lib/missing/ 
> posix_memalign.cc
> ===================================================================
> #include "posix_memalign.h"
> +#include <malloc.h>

This change breaks compile on OSX ... malloc.h is in /usr/include/ 
malloc/ on OSX, and is not needed on OSX or LINUX to be best of my  
knowledge for this code to compile ... only for the Windows  
environment.  Here's my suggested patch ... does no harm on Linux,  
takes care of the issue on Windows, and allows OSX to compile:

Index: configure.ac
===================================================================
--- configure.ac        (revision 10414)
+++ configure.ac        (working copy)
@@ -127,7 +127,7 @@
 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(netinet/in.h)
-AC_CHECK_HEADERS(windows.h)
+AC_CHECK_HEADERS(windows.h malloc.h)
 AC_CHECK_HEADERS(vec_types.h)

 dnl Checks for typedefs, structures, and compiler characteristics.
Index: gnuradio-core/src/lib/missing/posix_memalign.cc
===================================================================
--- gnuradio-core/src/lib/missing/posix_memalign.cc     (revision 10414)
+++ gnuradio-core/src/lib/missing/posix_memalign.cc     (working copy)
@@ -25,7 +25,10 @@
 #endif

 #include "posix_memalign.h"
+
+#ifdef HAVE_MALLOC_H
 #include <malloc.h>
+#endif

 #ifndef HAVE_POSIX_MEMALIGN