Skip to content

Commit c766023

Browse files
committed
minor compiler warning cleanups
Signed-off-by: Howard Pritchard <howardp@lanl.gov>
1 parent eb15f01 commit c766023

File tree

4 files changed

+12
-13
lines changed

4 files changed

+12
-13
lines changed

ompi/mpi/c/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,7 @@ prototype_sources = \
469469
win_unlock_all.c.in \
470470
win_unlock.c.in \
471471
win_wait.c.in \
472+
wtick.c.in \
472473
wtime.c.in
473474

474475
prototype_sources_nbc = \
@@ -577,8 +578,7 @@ extra_interface_profile_sources = \
577578
type_fromint_ompi.c \
578579
type_toint_ompi.c \
579580
win_fromint_ompi.c \
580-
win_toint_ompi.c \
581-
wtick.c
581+
win_toint_ompi.c
582582

583583
# The following functions were removed from the MPI standard, but are
584584
# retained for ABI compliance reasons. They are listed independently

ompi/mpi/c/Makefile_abi.include

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,7 @@ extra_abi_fns = \
7070
type_fromint_abi.c \
7171
type_toint_abi.c \
7272
win_fromint_abi.c \
73-
win_toint_abi.c \
74-
wtick.c
75-
73+
win_toint_abi.c
7674

7775
libmpi_c_abi_la_CPPFLAGS = -DOMPI_NO_MPI_PROTOTYPES -DOMPI_BUILD_MPI_PROFILING=0 -DOMPI_BUILD_STANDARD_ABI
7876
libmpi_c_abi_la_LIBADD = libmpi_c_abi_profile.la

ompi/mpi/c/pcontrol.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
2323
#include "ompi/mpi/c/bindings.h"
2424
#include "ompi/runtime/params.h"
2525
#include "ompi/errhandler/errhandler.h"
26+
/*
27+
* if compiling for ABI include abi.h to suppress compiler warning about no prototype
28+
*/
29+
#ifdef OMPI_NO_MPI_PROTOTYPES
30+
#include "ompi/mpi/c/abi.h"
31+
#endif
2632

2733
#if OMPI_BUILD_MPI_PROFILING
2834
#if OPAL_HAVE_WEAK_SYMBOLS
Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1616
* Copyright (c) 2017 Los Alamos National Security, LLC. All rights
1717
* reserved.
18+
* Copyright (c) 2025 Triad National Security, LLC. All rights
19+
* reserved.
1820
* $COPYRIGHT$
1921
*
2022
* Additional copyrights may follow
@@ -36,14 +38,7 @@
3638

3739
#include "opal/util/clock_gettime.h"
3840

39-
#if OMPI_BUILD_MPI_PROFILING
40-
#if OPAL_HAVE_WEAK_SYMBOLS
41-
#pragma weak MPI_Wtick = PMPI_Wtick
42-
#endif
43-
#define MPI_Wtick PMPI_Wtick
44-
#endif
45-
46-
double MPI_Wtick(void)
41+
PROTOTYPE DOUBLE Wtick()
4742
{
4843
// We intentionally don't use the OPAL timer framework here. See
4944
// https://github.com/open-mpi/ompi/issues/3003 for more details.

0 commit comments

Comments
 (0)