Skip to content

Commit c6b44ab

Browse files
committed
pmix/{cray,s1,s2}: make pmi_opcaddy_t class static
theses three pmix components use the same class name, declare it as static so Open MPI can be built with --disable-dlopen Thanks Limin Gu for the report (back-ported from commit 871ade9)
1 parent 4afc1d1 commit c6b44ab

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

opal/mca/pmix/cray/pmix_cray.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Copyright (c) 2011-2015 Los Alamos National Security, LLC. All
77
* rights reserved.
88
* Copyright (c) 2013-2015 Intel, Inc. All rights reserved.
9-
* Copyright (c) 2014-2015 Research Organization for Information Science
9+
* Copyright (c) 2014-2016 Research Organization for Information Science
1010
* and Technology (RIST). All rights reserved.
1111
* $COPYRIGHT$
1212
*
@@ -127,9 +127,9 @@ typedef struct {
127127
opal_pmix_op_cbfunc_t opcbfunc;
128128
void *cbdata;
129129
} pmi_opcaddy_t;
130-
OBJ_CLASS_INSTANCE(pmi_opcaddy_t,
131-
opal_object_t,
132-
NULL, NULL);
130+
static OBJ_CLASS_INSTANCE(pmi_opcaddy_t,
131+
opal_object_t,
132+
NULL, NULL);
133133

134134
// PMI constant values:
135135
static int pmix_kvslen_max = 0;

opal/mca/pmix/s1/pmix_s1.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
22
/*
33
* Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
4-
* Copyright (c) 2014-2015 Research Organization for Information Science
4+
* Copyright (c) 2014-2016 Research Organization for Information Science
55
* and Technology (RIST). All rights reserved.
66
* $COPYRIGHT$
77
*
@@ -88,9 +88,9 @@ typedef struct {
8888
opal_pmix_op_cbfunc_t opcbfunc;
8989
void *cbdata;
9090
} pmi_opcaddy_t;
91-
OBJ_CLASS_INSTANCE(pmi_opcaddy_t,
92-
opal_object_t,
93-
NULL, NULL);
91+
static OBJ_CLASS_INSTANCE(pmi_opcaddy_t,
92+
opal_object_t,
93+
NULL, NULL);
9494

9595
// PMI constant values:
9696
static int pmix_kvslen_max = 0;

opal/mca/pmix/s2/pmix_s2.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Copyright (c) 2011-2013 Los Alamos National Security, LLC. All
77
* rights reserved.
88
* Copyright (c) 2013-2016 Intel, Inc. All rights reserved.
9-
* Copyright (c) 2014-2015 Research Organization for Information Science
9+
* Copyright (c) 2014-2016 Research Organization for Information Science
1010
* and Technology (RIST). All rights reserved.
1111
* $COPYRIGHT$
1212
*
@@ -95,9 +95,9 @@ typedef struct {
9595
opal_pmix_op_cbfunc_t opcbfunc;
9696
void *cbdata;
9797
} pmi_opcaddy_t;
98-
OBJ_CLASS_INSTANCE(pmi_opcaddy_t,
99-
opal_object_t,
100-
NULL, NULL);
98+
static OBJ_CLASS_INSTANCE(pmi_opcaddy_t,
99+
opal_object_t,
100+
NULL, NULL);
101101

102102
// PMI constant values:
103103
static int pmix_kvslen_max = 0;

0 commit comments

Comments
 (0)