Revert "Rename mca.h to pmix_mca.h to avoid include-path confusion"

This reverts commit 4d2e2b5.

Signed-off-by: Ralph Castain <[email protected]>

Author: rhc54

src/hwloc/pmix_hwloc.h

@@ -34,7 +34,7 @@
 #include "src/include/pmix_globals.h"
 #include "src/mca/base/pmix_mca_base_framework.h"
 #include "src/mca/base/pmix_mca_base_var.h"
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 #include "src/server/pmix_server_ops.h"
 
 BEGIN_C_DECLS

src/mca/Makefile.include

@@ -12,7 +12,6 @@
 #                         All rights reserved.
 # Copyright (c) 2016      Intel, Inc. All rights reserved.
 # Copyright (c) 2016 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2022      Nanook Consulting.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -24,4 +23,4 @@
 
 # Source code files
 headers += \
-	mca/pmix_mca.h
+	mca/mca.h

src/mca/base/pmix_base.h

@@ -37,7 +37,7 @@
  */
 #include "src/mca/base/pmix_mca_base_framework.h"
 #include "src/mca/base/pmix_mca_base_var.h"
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 #include "src/util/pmix_cmd_line.h"
 #include "src/util/pmix_output.h"
 

src/mca/base/pmix_mca_base_close.c

@@ -27,7 +27,7 @@
 #include "pmix_common.h"
 #include "src/mca/base/pmix_base.h"
 #include "src/mca/base/pmix_mca_base_component_repository.h"
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 #include "src/util/pmix_output.h"
 
 extern int pmix_mca_base_opened;

src/mca/base/pmix_mca_base_component_compare.c

@@ -23,7 +23,7 @@
 #include <string.h>
 
 #include "src/mca/base/pmix_base.h"
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 
 /*
  * Function for comparing two pmix_mca_base_component_priority_t structs so

src/mca/base/pmix_mca_base_component_find.c

@@ -52,7 +52,7 @@
 #include "src/include/pmix_globals.h"
 #include "src/mca/base/pmix_base.h"
 #include "src/mca/base/pmix_mca_base_component_repository.h"
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 #include "src/mca/pdl/base/base.h"
 #include "src/mca/pinstalldirs/pinstalldirs.h"
 #include "src/util/pmix_argv.h"

src/mca/base/pmix_mca_base_component_repository.c

@@ -41,7 +41,7 @@
 #include "src/include/pmix_globals.h"
 #include "src/mca/base/pmix_base.h"
 #include "src/mca/base/pmix_mca_base_component_repository.h"
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 #include "src/mca/pdl/base/base.h"
 #include "src/util/pmix_printf.h"
 #include "src/util/pmix_basename.h"

src/mca/base/pmix_mca_base_components_close.c

@@ -27,7 +27,7 @@
 #include "src/class/pmix_list.h"
 #include "src/mca/base/pmix_base.h"
 #include "src/mca/base/pmix_mca_base_component_repository.h"
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 #include "src/util/pmix_output.h"
 
 void pmix_mca_base_component_unload(const pmix_mca_base_component_t *component, int output_id)

src/mca/base/pmix_mca_base_components_open.c

@@ -32,7 +32,7 @@
 #include "pmix_common.h"
 #include "src/class/pmix_list.h"
 #include "src/mca/base/pmix_base.h"
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 #include "src/util/pmix_argv.h"
 #include "src/util/pmix_error.h"
 #include "src/util/pmix_output.h"

src/mca/base/pmix_mca_base_components_register.c

@@ -33,7 +33,7 @@
 #include "src/mca/base/pmix_base.h"
 #include "src/mca/base/pmix_mca_base_component_repository.h"
 #include "src/mca/base/pmix_mca_base_framework.h"
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 #include "src/util/pmix_argv.h"
 #include "src/util/pmix_error.h"
 #include "src/util/pmix_output.h"