Skip to content

Commit 13e4040

Browse files
authored
Merge pull request #6992 from awlauria/fix_prefix_mpir
Add 'orte_' prefix to noop_mpir_breakpoint_ptr.
2 parents cc586d8 + 7714468 commit 13e4040

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

orte/orted/orted_submit.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ ORTE_DECLSPEC void __opal_attribute_optnone__ MPIR_Breakpoint(void);
192192
* See the following git issue for more discussion:
193193
* https://github.com/open-mpi/ompi/issues/5501
194194
*/
195-
volatile void* volatile noop_mpir_breakpoint_ptr = NULL;
195+
volatile void* volatile orte_noop_mpir_breakpoint_ptr = NULL;
196196

197197
/*
198198
* Breakpoint function for parallel debuggers
@@ -210,7 +210,7 @@ void MPIR_Breakpoint(void)
210210
* *should not* be used anywhere else in the code.
211211
* So pointing this to the weeds should be OK.
212212
*/
213-
noop_mpir_breakpoint_ptr = (volatile void *) 0x42;
213+
orte_noop_mpir_breakpoint_ptr = (volatile void *) 0x42;
214214
return;
215215
}
216216

0 commit comments

Comments
 (0)