Skip to content

Commit 17a1f97

Browse files
committed
Remove the use of [OPAL|OMPI|OSHMEM]_MODULE_DECLSPEC
In native Microsoft Windows builds, there is difference in how MCA component struct symbols need to be exported compared to other symbols. The "MODULE_DECLSPEC" macros were for exporting MCA component struct symbols, and "DECLSPEC" macros were for all exporting all other symbols. In other operating systems, there's no difference in how these two types of symbols are exported. Once Open MPI stopped supporting native Microsoft Windows builds, there was no need to preserve the difference. This commit therefore does the following: - Removes all definitions of the "MODULE_DECLSPEC" macros - Converts all uses of the "MODULE_DECLSPEC" macros to "DECLSPEC" - Removes stale Microsoft Windows declarations in oshmem_config.h Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
1 parent 174b095 commit 17a1f97

File tree

71 files changed

+75
-115
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+75
-115
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ struct mca_btl_tcp2_component_t {
9898
};
9999
typedef struct mca_btl_tcp2_component_t mca_btl_tcp2_component_t;
100100

101-
OMPI_MODULE_DECLSPEC extern mca_btl_tcp2_component_t mca_btl_tcp2_component;
101+
OMPI_DECLSPEC extern mca_btl_tcp2_component_t mca_btl_tcp2_component;
102102

103103
/**
104104
* BTL Module Interface

ompi/include/ompi_config.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* University of Stuttgart. All rights reserved.
1111
* Copyright (c) 2004-2005 The Regents of the University of California.
1212
* All rights reserved.
13-
* Copyright (c) 2007-2012 Cisco Systems, Inc. All rights reserved.
13+
* Copyright (c) 2007-2022 Cisco Systems, Inc. All rights reserved.
1414
* Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
1515
* Copyright (c) 2014 Research Organization for Information Science
1616
* and Technology (RIST). All rights reserved.
@@ -44,16 +44,10 @@
4444
# ifndef OMPI_DECLSPEC
4545
# define OMPI_DECLSPEC __opal_attribute_visibility__("default")
4646
# endif
47-
# ifndef OMPI_MODULE_DECLSPEC
48-
# define OMPI_MODULE_DECLSPEC __opal_attribute_visibility__("default")
49-
# endif
5047
# else
5148
# ifndef OMPI_DECLSPEC
5249
# define OMPI_DECLSPEC
5350
# endif
54-
# ifndef OMPI_MODULE_DECLSPEC
55-
# define OMPI_MODULE_DECLSPEC
56-
# endif
5751
# endif
5852

5953
#endif

ompi/mca/coll/adapt/coll_adapt.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ struct mca_coll_adapt_module_t {
133133
OBJ_CLASS_DECLARATION(mca_coll_adapt_module_t);
134134

135135
/* Global component instance */
136-
OMPI_MODULE_DECLSPEC extern mca_coll_adapt_component_t mca_coll_adapt_component;
136+
OMPI_DECLSPEC extern mca_coll_adapt_component_t mca_coll_adapt_component;
137137

138138
/* ADAPT module functions */
139139
int ompi_coll_adapt_init_query(bool enable_progress_threads, bool enable_mpi_threads);

ompi/mca/coll/basic/coll_basic.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ BEGIN_C_DECLS
3939

4040
/* Globally exported variables */
4141

42-
OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_2_4_0_t
42+
OMPI_DECLSPEC extern const mca_coll_base_component_2_4_0_t
4343
mca_coll_basic_component;
4444
extern int mca_coll_basic_priority;
4545
extern int mca_coll_basic_crossover;

ompi/mca/coll/cuda/coll_cuda.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ typedef struct mca_coll_cuda_component_t {
9494

9595
/* Globally exported variables */
9696

97-
OMPI_MODULE_DECLSPEC extern mca_coll_cuda_component_t mca_coll_cuda_component;
97+
OMPI_DECLSPEC extern mca_coll_cuda_component_t mca_coll_cuda_component;
9898

9999
END_C_DECLS
100100

ompi/mca/coll/demo/coll_demo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ BEGIN_C_DECLS
3030

3131
/* Globally exported variables */
3232

33-
OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_2_4_0_t mca_coll_demo_component;
33+
OMPI_DECLSPEC extern const mca_coll_base_component_2_4_0_t mca_coll_demo_component;
3434
extern int mca_coll_demo_priority;
3535
extern int mca_coll_demo_verbose;
3636

ompi/mca/coll/ftagree/coll_ftagree.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ BEGIN_C_DECLS
3232

3333
/* Globally exported variables */
3434

35-
OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_2_4_0_t
35+
OMPI_DECLSPEC extern const mca_coll_base_component_2_4_0_t
3636
mca_coll_ftagree_component;
3737
extern int mca_coll_ftagree_priority;
3838

ompi/mca/coll/han/coll_han.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ OBJ_CLASS_DECLARATION(mca_coll_han_module_t);
394394
/**
395395
* Global component instance
396396
*/
397-
OMPI_MODULE_DECLSPEC extern mca_coll_han_component_t mca_coll_han_component;
397+
OMPI_DECLSPEC extern mca_coll_han_component_t mca_coll_han_component;
398398

399399
/*
400400
* coll module functions

ompi/mca/coll/hcoll/coll_hcoll.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ struct mca_coll_hcoll_component_t {
100100
};
101101
typedef struct mca_coll_hcoll_component_t mca_coll_hcoll_component_t;
102102

103-
OMPI_MODULE_DECLSPEC extern mca_coll_hcoll_component_t mca_coll_hcoll_component;
103+
OMPI_DECLSPEC extern mca_coll_hcoll_component_t mca_coll_hcoll_component;
104104

105105

106106

ompi/mca/coll/inter/coll_inter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ BEGIN_C_DECLS
3737
* Globally exported variable
3838
*/
3939

40-
OMPI_MODULE_DECLSPEC extern const mca_coll_base_component_2_4_0_t mca_coll_inter_component;
40+
OMPI_DECLSPEC extern const mca_coll_base_component_2_4_0_t mca_coll_inter_component;
4141
extern int mca_coll_inter_priority_param;
4242
extern int mca_coll_inter_verbose_param;
4343

0 commit comments

Comments
 (0)