treematch: do not include <hwloc.h>

jsquyres · markalle · commit c8535721ba90 · 2017-04-05T15:07:35.000-04:00
Instead, include "opal/mca/hwloc/hwloc.h"

Signed-off-by: Jeff Squyres &lt;jsquyres@cisco.com&gt;
diff --git a/ompi/mca/topo/treematch/treematch/tm_hwloc.c b/ompi/mca/topo/treematch/treematch/tm_hwloc.c
@@ -1,5 +1,4 @@
-#include <hwloc.h>
-#include <hwloc/helper.h>
+#include "opal/mca/hwloc/hwloc.h"
 #include "tm_tree.h"
 #include "tm_mapping.h"
 #include <ctype.h>
diff --git a/ompi/mca/topo/treematch/treematch/tm_hwloc.h b/ompi/mca/topo/treematch/treematch/tm_hwloc.h
@@ -1,4 +1,4 @@
-#include <hwloc.h>
+#include "opal/mca/hwloc/hwloc.h"
 #include "tm_tree.h"
 
 void hwloc_topology_tag(hwloc_topology_t topology);
diff --git a/ompi/mca/topo/treematch/treematch/tm_thread_pool.c b/ompi/mca/topo/treematch/treematch/tm_thread_pool.c
@@ -1,7 +1,7 @@
 #include <pthread.h>
 #include "tm_thread_pool.h"
 #include "tm_verbose.h"
-#include <hwloc.h>
+#include "opal/mca/hwloc/hwloc.h"
 #include "tm_verbose.h"
 #include "tm_tree.h"
 #include <errno.h>
diff --git a/ompi/mca/topo/treematch/treematch/tm_thread_pool.h b/ompi/mca/topo/treematch/treematch/tm_thread_pool.h
@@ -2,7 +2,7 @@
 #define THREAD_POOL_H
 
 #include <pthread.h>
-#include <hwloc.h>
+#include "opal/mca/hwloc/hwloc.h"
 
 
 typedef struct _work_t{

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include <hwloc.h>`
	`1`	`+#include "opal/mca/hwloc/hwloc.h"`
`2`	`2`	`#include "tm_tree.h"`
`3`	`3`
`4`	`4`	`void hwloc_topology_tag(hwloc_topology_t topology);`