Pull upstream hwloc commit 5198d4c0fd6cae12756fb44aed16a2d4a58b1a25
Change the logic in bind.c to only include <malloc.h> if we don't have posix_memalign. In http://www.open-mpi.org/community/lists/devel/2014/01/13619.php, Paul Hargrove found a compiler warning on OpenBSD where <malloc.h> exists, but is not intended to be used (and doesn't error out, so AC_CHECK_HEADERS says its ok). Reviewed by Brice Goglin. cmr=v1.7.4:reviewer=ompi-rm1.7 This commit was SVN r30234.
Этот коммит содержится в:
родитель
350d989c00
Коммит
962a14cf6d
@ -1,3 +1,4 @@
|
|||||||
Applied the following patches from the upstream hwloc 1.7 branch after
|
Applied the following patches from the upstream hwloc 1.7 branch after
|
||||||
the v1.7.2 release:
|
the v1.7.2 release:
|
||||||
|
|
||||||
|
5198d4c Only include <malloc.h> if necessary
|
||||||
|
@ -13,7 +13,8 @@
|
|||||||
#ifdef HAVE_SYS_MMAN_H
|
#ifdef HAVE_SYS_MMAN_H
|
||||||
# include <sys/mman.h>
|
# include <sys/mman.h>
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_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>
|
#include <malloc.h>
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_UNISTD_H
|
#ifdef HAVE_UNISTD_H
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user