fec519a793
Per a prior commit, the presence of "hwloc.h" can cause ambiguity when using --with-hwloc=external (i.e., whether to include opal/mca/hwloc/hwloc.h or whether to include the system-installed hwloc.h). This commit: 1. Renames opal/mca/hwloc/hwloc.h to hwloc-internal.h. 2. Adds opal/mca/hwloc/autogen.options to tell autogen.pl to expect to find hwloc-internal.h (instead of hwloc.h) in opal/mca/hwloc. 3. s@opal/mca/hwloc/hwloc.h@opal/mca/hwloc/hwloc-internal.h@g in the rest of the code base. Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
28 строки
474 B
C
28 строки
474 B
C
/*
|
|
* Copyright (c) 2011-2017 Cisco Systems, Inc. All rights reserved
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
|
|
#ifndef ORTE_RMAPS_PPR_H
|
|
#define ORTE_RMAPS_PPR_H
|
|
|
|
#include "orte_config.h"
|
|
|
|
#include "opal/mca/hwloc/hwloc-internal.h"
|
|
|
|
#include "orte/mca/rmaps/rmaps.h"
|
|
|
|
BEGIN_C_DECLS
|
|
|
|
ORTE_MODULE_DECLSPEC extern orte_rmaps_base_component_t mca_rmaps_ppr_component;
|
|
extern orte_rmaps_base_module_t orte_rmaps_ppr_module;
|
|
|
|
|
|
END_C_DECLS
|
|
|
|
#endif
|