Applied the following patches from the upstream hwloc 1.7 branch after
the v1.7.2 release:

5198d4c Only include <malloc.h> if necessary