K, will do. On Jan 10, 2014, at 12:00 PM, Brice Goglin <brice.gog...@inria.fr> wrote:
> Push it to master, we'll what regression testing at > https://ci.inria.fr/hwloc/job/master-1-check/ thinks about it > Brice > > > > "Jeff Squyres (jsquyres)" <jsquy...@cisco.com> a écrit : > Brice / Samuel -- > > In http://www.open-mpi.org/community/lists/devel/2014/01/13619.php, Paul > Hargrove found this compiler warning: > > ----- > On OpenBSD the header malloc.h exists, but is NOT intended to be used: > -bash-4.2$ grep -B2 'is obsolete' make.log > CC bind.lo > In file included from > /home/phargrov/OMPI/openmpi-1.7-latest-openbsd5-amd64/openmpi-1.7.4rc2r30168/opal/mca/hwloc/hwloc172/hwloc/src/bind.c:17: > /usr/include/malloc.h:4:2: warning: #warning "<malloc.h> is obsolete, use > <stdlib.h>" > ----- > > What do you think of this patch (or something like it)? > > diff --git a/src/bind.c b/src/bind.c > index 046b7cf..37921bc 100644 > --- a/src/bind.c > +++ b/src/bind.c > @@ -13,8 +13,9 @@ > #ifdef HAVE_SYS_MMAN_H > # include <sys/mman.h> > #endif > -#ifdef HAVE_MALLOC_H > - > # > include <malloc.h> > > +/* <malloc.h> is only needed if we don't have posix_memalign() */ > +#if defined(hwloc_getpagesize) && !defined(HAVE_POSIX_MEMALIGN) && > defined(HAVE_MEMALIGN) && defined(HAVE_MALLOC_H) > +#include <malloc.h> > #endif > #ifdef HAVE_UNISTD_H > #include <unistd.h> > > _______________________________________________ > hwloc-devel mailing list > hwloc-de...@open-mpi.org > http://www.open-mpi.org/mailman/listinfo.cgi/hwloc-devel -- Jeff Squyres jsquy...@cisco.com For corporate legal information go to: http://www.cisco.com/web/about/doing_business/legal/cri/
