Merge pull request open-mpi#10774 from jsquyres/pr/remove-module-declspec

Remove the use of [OPAL|OMPI|OSHMEM]_MODULE_DECLSPEC

Author: jsquyres

contrib/build-mca-comps-outside-of-tree/btl_tcp2.h

@@ -98,7 +98,7 @@ struct mca_btl_tcp2_component_t {
 };
 typedef struct mca_btl_tcp2_component_t mca_btl_tcp2_component_t;
 
-OMPI_MODULE_DECLSPEC extern mca_btl_tcp2_component_t mca_btl_tcp2_component;
+OMPI_DECLSPEC extern mca_btl_tcp2_component_t mca_btl_tcp2_component;
 
 /**
  * BTL Module Interface

ompi/include/ompi_config.h

@@ -10,7 +10,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2007-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2007-2022 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2007      Sun Microsystems, Inc.  All rights reserved.
  * Copyright (c) 2014      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
@@ -44,16 +44,10 @@
 #    ifndef OMPI_DECLSPEC
 #      define OMPI_DECLSPEC            __opal_attribute_visibility__("default")
 #    endif
-#    ifndef OMPI_MODULE_DECLSPEC
-#      define OMPI_MODULE_DECLSPEC     __opal_attribute_visibility__("default")
-#    endif
 #  else
 #    ifndef OMPI_DECLSPEC
 #      define OMPI_DECLSPEC
 #    endif
-#    ifndef OMPI_MODULE_DECLSPEC
-#      define OMPI_MODULE_DECLSPEC
-#    endif
 #  endif
 
 #endif

ompi/mca/coll/adapt/coll_adapt.h

@@ -133,7 +133,7 @@ struct mca_coll_adapt_module_t {
 OBJ_CLASS_DECLARATION(mca_coll_adapt_module_t);
 
 /* Global component instance */
-OMPI_MODULE_DECLSPEC extern mca_coll_adapt_component_t mca_coll_adapt_component;
+OMPI_DECLSPEC extern mca_coll_adapt_component_t mca_coll_adapt_component;
 
 /* ADAPT module functions */
 int ompi_coll_adapt_init_query(bool enable_progress_threads, bool enable_mpi_threads);

ompi/mca/coll/basic/coll_basic.h

@@ -39,7 +39,7 @@ BEGIN_C_DECLS
 
     /* Globally exported variables */
 
-    OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_2_4_0_t
+    OMPI_DECLSPEC extern const mca_coll_base_component_2_4_0_t
         mca_coll_basic_component;
     extern int mca_coll_basic_priority;
     extern int mca_coll_basic_crossover;

ompi/mca/coll/cuda/coll_cuda.h

@@ -94,7 +94,7 @@ typedef struct mca_coll_cuda_component_t {
 
 /* Globally exported variables */
 
-OMPI_MODULE_DECLSPEC extern mca_coll_cuda_component_t mca_coll_cuda_component;
+OMPI_DECLSPEC extern mca_coll_cuda_component_t mca_coll_cuda_component;
 
 END_C_DECLS
 

ompi/mca/coll/demo/coll_demo.h

@@ -30,7 +30,7 @@ BEGIN_C_DECLS
 
     /* Globally exported variables */
 
-OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_2_4_0_t mca_coll_demo_component;
+OMPI_DECLSPEC extern const mca_coll_base_component_2_4_0_t mca_coll_demo_component;
     extern int mca_coll_demo_priority;
     extern int mca_coll_demo_verbose;
 

ompi/mca/coll/ftagree/coll_ftagree.h

@@ -32,7 +32,7 @@ BEGIN_C_DECLS
 
 /* Globally exported variables */
 
-OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_2_4_0_t
+OMPI_DECLSPEC extern const mca_coll_base_component_2_4_0_t
 mca_coll_ftagree_component;
 extern int mca_coll_ftagree_priority;
 

ompi/mca/coll/han/coll_han.h

@@ -394,7 +394,7 @@ OBJ_CLASS_DECLARATION(mca_coll_han_module_t);
 /**
  * Global component instance
  */
-OMPI_MODULE_DECLSPEC extern mca_coll_han_component_t mca_coll_han_component;
+OMPI_DECLSPEC extern mca_coll_han_component_t mca_coll_han_component;
 
 /*
  * coll module functions

ompi/mca/coll/hcoll/coll_hcoll.h

@@ -100,7 +100,7 @@ struct mca_coll_hcoll_component_t {
 };
 typedef struct mca_coll_hcoll_component_t mca_coll_hcoll_component_t;
 
-OMPI_MODULE_DECLSPEC extern mca_coll_hcoll_component_t mca_coll_hcoll_component;
+OMPI_DECLSPEC extern mca_coll_hcoll_component_t mca_coll_hcoll_component;
 
 
 

ompi/mca/coll/inter/coll_inter.h

@@ -37,7 +37,7 @@ BEGIN_C_DECLS
  * Globally exported variable
  */
 
-OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_2_4_0_t mca_coll_inter_component;
+OMPI_DECLSPEC extern const mca_coll_base_component_2_4_0_t mca_coll_inter_component;
 extern int mca_coll_inter_priority_param;
 extern int mca_coll_inter_verbose_param;