Skip to content

Commit bfd0681

Browse files
committed
fortran: fix up a rebase conflict
Signed-off-by: Howard Pritchard <[email protected]>
1 parent 861f5b5 commit bfd0681

File tree

2 files changed

+0
-484
lines changed

2 files changed

+0
-484
lines changed

ompi/mpi/c/wtime.c.in

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,12 @@
4040

4141
#include "opal/util/clock_gettime.h"
4242

43-
#if OMPI_BUILD_MPI_PROFILING
4443
/**
4544
* Use this as a base time set early during MPI initialization to improve the range
4645
* and accuracy of the user visible timer.
4746
* More info: https://github.com/mpi-forum/mpi-issues/issues/77#issuecomment-369663119
4847
*/
49-
struct timespec ompi_wtime_time_origin = {.tv_sec = 0};
50-
#else
5148
extern struct timespec ompi_wtime_time_origin;
52-
#endif
5349

5450
PROTOTYPE DOUBLE wtime()
5551
{

0 commit comments

Comments
 (0)