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

This reverts commit 4d2e2b5.

Signed-off-by: Ralph Castain <rhc@pmix.org>

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"

src/mca/base/pmix_mca_base_components_select.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_error.h"
 #include "src/util/pmix_output.h"
 

src/mca/base/pmix_mca_base_framework.h

@@ -16,7 +16,7 @@
 #    include "src/include/pmix_config.h"
 
 #    include "src/class/pmix_list.h"
-#    include "src/mca/pmix_mca.h"
+#    include "src/mca/mca.h"
 
 /*
  * Register and open flags

src/mca/base/pmix_mca_base_open.c

@@ -36,7 +36,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/mca/pinstalldirs/pinstalldirs.h"
 #include "src/util/pmix_environ.h"
 #include "src/util/pmix_output.h"

src/mca/base/pmix_mca_base_parse_paramfile.c

@@ -30,7 +30,7 @@
 #include "src/include/pmix_globals.h"
 #include "src/mca/base/pmix_base.h"
 #include "src/mca/base/pmix_mca_base_vari.h"
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 #include "src/util/pmix_keyval_parse.h"
 
 static void save_value(const char *file, int lineno,

src/mca/base/pmix_mca_base_var.c

@@ -41,7 +41,7 @@
 #include "pmix_common.h"
 #include "src/include/pmix_stdint.h"
 #include "src/mca/base/pmix_mca_base_vari.h"
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 #include "src/mca/pinstalldirs/pinstalldirs.h"
 #include "src/util/pmix_argv.h"
 #include "src/util/pmix_error.h"

src/mca/base/pmix_mca_base_var.h

@@ -68,7 +68,7 @@
 #include "src/mca/base/pmix_mca_base_framework.h"
 #include "src/mca/base/pmix_mca_base_var_enum.h"
 #include "src/mca/base/pmix_mca_base_var_group.h"
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 
 /**
  * The types of MCA variables.

src/mca/base/pmix_mca_base_var_group.c

@@ -38,7 +38,7 @@
 #include "pmix_common.h"
 #include "src/include/pmix_stdint.h"
 #include "src/mca/base/pmix_mca_base_vari.h"
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 #include "src/util/pmix_output.h"
 #include "src/util/pmix_environ.h"
 #include "src/util/pmix_show_help.h"

src/mca/base/pmix_mca_base_var_group.h

@@ -25,7 +25,7 @@
 #ifndef PMIX_MCA_BASE_VAR_GROUP_H
 #define PMIX_MCA_BASE_VAR_GROUP_H
 
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 
 struct pmix_mca_base_var_group_t {
     pmix_list_item_t super;

src/mca/bfrops/base/base.h

@@ -16,7 +16,7 @@
  *                         and Technology (RIST).  All rights reserved.
  * Copyright (c) 2019      Mellanox Technologies, Inc.
  *                         All rights reserved.
- * Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+ * Copyright (c) 2021      Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -40,7 +40,7 @@
 #include "src/include/pmix_globals.h"
 #include "src/mca/base/pmix_mca_base_framework.h"
 #include "src/mca/bfrops/bfrops.h"
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 
 BEGIN_C_DECLS
 

src/mca/bfrops/base/bfrop_base_frame.c

@@ -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/bfrops/base/base.h"
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 
 /*
  * The following file was created by configure.  It contains extern

src/mca/bfrops/base/bfrop_base_select.c

@@ -26,7 +26,7 @@
 #include <string.h>
 
 #include "src/mca/base/pmix_base.h"
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 #include "src/util/pmix_error.h"
 #include "src/util/pmix_show_help.h"
 

src/mca/bfrops/bfrops.h

@@ -36,7 +36,7 @@
 #include "pmix_common.h"
 #include "src/include/pmix_types.h"
 
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 
 #include "bfrops_types.h"
 

src/mca/gds/base/base.h

@@ -17,7 +17,7 @@
  * Copyright (c) 2018      IBM Corporation.  All rights reserved.
  * Copyright (c) 2019      Mellanox Technologies, Inc.
  *                         All rights reserved.
- * Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+ * Copyright (c) 2021      Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -39,7 +39,7 @@
 
 #include "src/class/pmix_list.h"
 #include "src/mca/base/pmix_mca_base_framework.h"
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 
 #include "src/mca/gds/gds.h"
 

src/mca/gds/base/gds_base_select.c

@@ -26,7 +26,7 @@
 #include <string.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_show_help.h"

src/mca/gds/gds.h

@@ -21,7 +21,7 @@
 #include "src/mca/base/pmix_mca_base_framework.h"
 #include "src/mca/base/pmix_mca_base_var.h"
 #include "src/mca/bfrops/bfrops_types.h"
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 
 /* The client dictates the GDS module that will be used to interact
  * with the server - this module is stored in pmix_globals.mypeer->compat.gds

src/mca/pmix_mca.h renamed to src/mca/mca.h

@@ -24,7 +24,7 @@
 
 #include "pmix_common.h"
 #include "src/mca/base/pmix_base.h"
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 #include "src/mca/pcompress/base/base.h"
 #include "src/util/pmix_output.h"
 

src/mca/pcompress/base/pcompress_base_select.c

@@ -34,7 +34,7 @@
 #include "pmix_config.h"
 #include "src/class/pmix_object.h"
 #include "src/mca/base/pmix_base.h"
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {

src/mca/pcompress/pcompress.h

@@ -25,7 +25,7 @@
 
 #include "src/util/pmix_output.h"
 
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 #include "src/mca/pcompress/pcompress.h"
 
 #if defined(c_plusplus) || defined(__cplusplus)

src/mca/pcompress/zlib/compress_zlib.h

@@ -14,7 +14,7 @@
 #include "src/include/pmix_config.h"
 
 #include "src/mca/base/pmix_base.h"
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 
 #include "src/mca/pdl/base/base.h"
 #include "src/mca/pdl/pdl.h"

src/mca/pdl/base/pdl_base_close.c

@@ -23,7 +23,7 @@
 
 #include "pmix_common.h"
 #include "src/mca/base/pmix_base.h"
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 #include "src/mca/pdl/base/base.h"
 #include "src/mca/pdl/pdl.h"
 #include "src/util/pmix_output.h"

src/mca/pdl/base/pdl_base_select.c

@@ -52,7 +52,7 @@
 #include "src/include/pmix_config.h"
 
 #include "src/mca/base/pmix_base.h"
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 
 BEGIN_C_DECLS
 

src/mca/pdl/pdl.h

@@ -12,7 +12,7 @@
  * Copyright (c) 2011 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2013      Los Alamos National Security, LLC.  All rights reserved.
  * Copyright (c) 2017-2020 Intel, Inc.  All rights reserved.
- * Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+ * Copyright (c) 2021      Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -32,7 +32,7 @@
 
 #include "src/class/pmix_list.h"
 #include "src/common/pmix_iof.h"
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 #include "src/mca/pfexec/pfexec.h"
 
 BEGIN_C_DECLS

src/mca/pfexec/base/base.h

@@ -38,7 +38,7 @@
 #include "src/common/pmix_iof.h"
 #include "src/include/pmix_globals.h"
 #include "src/mca/base/pmix_base.h"
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 #include "src/threads/pmix_threads.h"
 #include "src/util/pmix_error.h"
 

src/mca/pfexec/base/pfexec_base_frame.c

@@ -25,7 +25,7 @@
 #include "pmix_common.h"
 
 #include "src/mca/base/pmix_base.h"
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 
 #include "src/mca/pfexec/base/base.h"
 

src/mca/pfexec/base/pfexec_base_select.c

@@ -26,7 +26,7 @@
 
 #include "pmix_config.h"
 
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 
 #include "src/mca/pfexec/pfexec.h"
 

src/mca/pfexec/linux/pfexec_linux.h

@@ -37,7 +37,7 @@
 #include <ctype.h>
 
 #include "src/mca/base/pmix_base.h"
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 
 #include "src/mca/pfexec/linux/pfexec_linux.h"
 #include "src/mca/pfexec/pfexec.h"

src/mca/pfexec/linux/pfexec_linux_component.c

@@ -34,7 +34,7 @@
 #include "pmix_common.h"
 #include "src/include/pmix_types.h"
 
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 
 BEGIN_C_DECLS
 

src/mca/pfexec/pfexec.h

@@ -14,7 +14,7 @@
  * Copyright (c) 2014-2020 Intel, Inc.  All rights reserved.
  * Copyright (c) 2015-2020 Research Organization for Information Science
  *                         and Technology (RIST).  All rights reserved.
- * Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+ * Copyright (c) 2021      Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -37,7 +37,7 @@
 #include "src/class/pmix_list.h"
 #include "src/class/pmix_pointer_array.h"
 #include "src/mca/base/pmix_mca_base_framework.h"
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 
 #include "src/mca/pgpu/pgpu.h"
 

src/mca/pgpu/base/base.h

@@ -26,7 +26,7 @@
 #include <string.h>
 
 #include "src/mca/base/pmix_base.h"
-#include "src/mca/pmix_mca.h"
+#include "src/mca/mca.h"
 
 #include "src/mca/pgpu/base/base.h"