open-mpi · markalle · Aug 24, 2017 · Dec 19, 2017
diff --git a/ompi/mpi/fortran/base/Makefile.am b/ompi/mpi/fortran/base/Makefile.am
@@ -50,5 +50,17 @@ libmpi_fortran_base_la_SOURCES = \
         conversion_fn_null_f.c \
         f90_accessors.c \
         strings.c \
-        test_constants_f.c
+        test_constants_f.c \
+        constructed_code_done.h
+
+BUILT_SOURCES = constructed_code_done.h
+
+here_src = $(top_srcdir)/ompi/mpi/fortran/mpif-h
+constructed_code_done.h: $(here_src)/normalize_mpih.pl $(here_src)/mkcode.pl $(top_srcdir)/ompi/include/mpi.h.in
+	rm -f flist && \
+	perl $(here_src)/normalize_mpih.pl $(top_srcdir)/ompi/include/mpi.h.in > flist && \
+	perl $(here_src)/mkcode.pl
+
+clean-local:
+	rm -f constructed_code_*.h
 endif
diff --git a/ompi/mpi/fortran/mpif-h/Makefile.am b/ompi/mpi/fortran/mpif-h/Makefile.am
@@ -501,3 +501,23 @@ if WANT_INSTALL_HEADERS
 ompidir = $(ompiincludedir)/$(subdir)
 ompi_HEADERS = $(headers)
 endif
+
+here_src = $(top_srcdir)/ompi/mpi/fortran/mpif-h
+
+if OMPI_BUILD_FORTRAN_MPIFH_BINDINGS
+lib@OMPI_LIBMPI_NAME@_mpifh_la_SOURCES += use_fptrs.c constructed_code_done.h
+# This causes constructed_code_done.h to be created before the regular
+# makefile rules happen for the rest of the source.
+BUILT_SOURCES = constructed_code_done.h
+
+use_fptrs.lo: use_fptrs.c constructed_code_done.h
+
+constructed_code_done.h: normalize_mpih.pl mkcode.pl $(top_srcdir)/ompi/include/mpi.h.in
+	rm -f flist && \
+	perl $(here_src)/normalize_mpih.pl $(top_srcdir)/ompi/include/mpi.h.in > flist && \
+	perl $(here_src)/mkcode.pl
+
+clean-local:
+	rm -f constructed_code_*.h
+
+endif
diff --git a/ompi/mpi/fortran/mpif-h/abort_f.c b/ompi/mpi/fortran/mpif-h/abort_f.c
@@ -72,6 +72,6 @@ void ompi_abort_f(MPI_Fint *comm, MPI_Fint *errorcode, MPI_Fint *ierr)
     int ierr_c;
     MPI_Comm c_comm = PMPI_Comm_f2c(*comm);
 
-    ierr_c = PMPI_Abort(c_comm, OMPI_FINT_2_INT(*errorcode));
+    ierr_c = OMPI_FORTRAN_FPTR(MPI_Abort)(c_comm, OMPI_FINT_2_INT(*errorcode));
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c);
 }
diff --git a/ompi/mpi/fortran/mpif-h/accumulate_f.c b/ompi/mpi/fortran/mpif-h/accumulate_f.c
@@ -81,7 +81,7 @@ void ompi_accumulate_f(char *origin_addr, MPI_Fint *origin_count,
     MPI_Win c_win = PMPI_Win_f2c(*win);
     MPI_Op c_op = PMPI_Op_f2c(*op);
 
-    ierr_c = PMPI_Accumulate(OMPI_F2C_BOTTOM(origin_addr),
+    ierr_c = OMPI_FORTRAN_FPTR(MPI_Accumulate)(OMPI_F2C_BOTTOM(origin_addr),
                              OMPI_FINT_2_INT(*origin_count),
                              c_origin_datatype,
                              OMPI_FINT_2_INT(*target_rank),

diff --git a/ompi/mpi/fortran/mpif-h/add_error_class_f.c b/ompi/mpi/fortran/mpif-h/add_error_class_f.c
@@ -71,7 +71,7 @@ void ompi_add_error_class_f(MPI_Fint *errorclass, MPI_Fint *ierr)
     int ierr_c;
     OMPI_SINGLE_NAME_DECL(errorclass);
 
-    ierr_c = PMPI_Add_error_class(OMPI_SINGLE_NAME_CONVERT(errorclass));
+    ierr_c = OMPI_FORTRAN_FPTR(MPI_Add_error_class)(OMPI_SINGLE_NAME_CONVERT(errorclass));
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c);
 
     if (MPI_SUCCESS == ierr_c) {

diff --git a/ompi/mpi/fortran/mpif-h/add_error_code_f.c b/ompi/mpi/fortran/mpif-h/add_error_code_f.c
@@ -71,7 +71,7 @@ void ompi_add_error_code_f(MPI_Fint *errorclass, MPI_Fint *errorcode, MPI_Fint *
     int ierr_c;
     OMPI_SINGLE_NAME_DECL(errorcode);
 
-    ierr_c = PMPI_Add_error_code(OMPI_FINT_2_INT(*errorclass),
+    ierr_c = OMPI_FORTRAN_FPTR(MPI_Add_error_code)(OMPI_FINT_2_INT(*errorclass),
                                  OMPI_SINGLE_NAME_CONVERT(errorcode)
                                  );
 

diff --git a/ompi/mpi/fortran/mpif-h/add_error_string_f.c b/ompi/mpi/fortran/mpif-h/add_error_string_f.c
@@ -83,7 +83,7 @@ void ompi_add_error_string_f(MPI_Fint *errorcode, char *string,
     }
 
     ompi_fortran_string_f2c(string, len, &c_string);
-    ierr_c = PMPI_Add_error_string(OMPI_FINT_2_INT(*errorcode), c_string);
+    ierr_c = OMPI_FORTRAN_FPTR(MPI_Add_error_string)(OMPI_FINT_2_INT(*errorcode), c_string);
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c);
     free(c_string);
 }
diff --git a/ompi/mpi/fortran/mpif-h/address_f.c b/ompi/mpi/fortran/mpif-h/address_f.c
@@ -71,7 +71,7 @@ void ompi_address_f(char *location, MPI_Fint *address, MPI_Fint *ierr)
     int ierr_c;
     MPI_Aint addr;
 
-    ierr_c = PMPI_Address(location, &addr);
+    ierr_c = OMPI_FORTRAN_FPTR(MPI_Address)(location, &addr);
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c);
 
     if (MPI_SUCCESS == ierr_c) {

diff --git a/ompi/mpi/fortran/mpif-h/allgather_f.c b/ompi/mpi/fortran/mpif-h/allgather_f.c
@@ -83,7 +83,7 @@ void ompi_allgather_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype,
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
-    ierr_c = PMPI_Allgather(sendbuf,
+    ierr_c = OMPI_FORTRAN_FPTR(MPI_Allgather)(sendbuf,
                             OMPI_FINT_2_INT(*sendcount),
                             c_sendtype,
                             recvbuf,

diff --git a/ompi/mpi/fortran/mpif-h/allgatherv_f.c b/ompi/mpi/fortran/mpif-h/allgatherv_f.c
@@ -89,7 +89,7 @@ void ompi_allgatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype,
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
-    ierr_c = PMPI_Allgatherv(sendbuf,
+    ierr_c = OMPI_FORTRAN_FPTR(MPI_Allgatherv)(sendbuf,
                              OMPI_FINT_2_INT(*sendcount),
                              c_sendtype,
                              recvbuf,

diff --git a/ompi/mpi/fortran/mpif-h/alloc_mem_f.c b/ompi/mpi/fortran/mpif-h/alloc_mem_f.c
@@ -104,7 +104,7 @@ void ompi_alloc_mem_f(MPI_Aint *size, MPI_Fint *info, char *baseptr, MPI_Fint *i
     int ierr_c;
     MPI_Info c_info = PMPI_Info_f2c(*info);
 
-    ierr_c = PMPI_Alloc_mem(*size, c_info, baseptr);
+    ierr_c = OMPI_FORTRAN_FPTR(MPI_Alloc_mem)(*size, c_info, baseptr);
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c);
 }
 

diff --git a/ompi/mpi/fortran/mpif-h/allreduce_f.c b/ompi/mpi/fortran/mpif-h/allreduce_f.c
@@ -84,7 +84,7 @@ void ompi_allreduce_f(char *sendbuf, char *recvbuf, MPI_Fint *count,
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
-    ierr_c = PMPI_Allreduce(sendbuf, recvbuf,
+    ierr_c = OMPI_FORTRAN_FPTR(MPI_Allreduce)(sendbuf, recvbuf,
                             OMPI_FINT_2_INT(*count),
                             c_type, c_op, c_comm);
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c);

diff --git a/ompi/mpi/fortran/mpif-h/alltoall_f.c b/ompi/mpi/fortran/mpif-h/alltoall_f.c
@@ -83,7 +83,7 @@ void ompi_alltoall_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype,
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
-    c_ierr = PMPI_Alltoall(sendbuf,
+    c_ierr = OMPI_FORTRAN_FPTR(MPI_Alltoall)(sendbuf,
                           OMPI_FINT_2_INT(*sendcount),
                           c_sendtype,
                           recvbuf,

diff --git a/ompi/mpi/fortran/mpif-h/alltoallv_f.c b/ompi/mpi/fortran/mpif-h/alltoallv_f.c
@@ -94,7 +94,7 @@ void ompi_alltoallv_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *sdispls,
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
-    c_ierr = PMPI_Alltoallv(sendbuf,
+    c_ierr = OMPI_FORTRAN_FPTR(MPI_Alltoallv)(sendbuf,
                            OMPI_ARRAY_NAME_CONVERT(sendcounts),
                            OMPI_ARRAY_NAME_CONVERT(sdispls),
                            c_sendtype,

diff --git a/ompi/mpi/fortran/mpif-h/alltoallw_f.c b/ompi/mpi/fortran/mpif-h/alltoallw_f.c
@@ -102,7 +102,7 @@ void ompi_alltoallw_f(char *sendbuf, MPI_Fint *sendcounts,
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
-    c_ierr = PMPI_Alltoallw(sendbuf,
+    c_ierr = OMPI_FORTRAN_FPTR(MPI_Alltoallw)(sendbuf,
                            OMPI_ARRAY_NAME_CONVERT(sendcounts),
                            OMPI_ARRAY_NAME_CONVERT(sdispls),
                            c_sendtypes,

diff --git a/ompi/mpi/fortran/mpif-h/attr_delete_f.c b/ompi/mpi/fortran/mpif-h/attr_delete_f.c
@@ -72,6 +72,6 @@ void ompi_attr_delete_f(MPI_Fint *comm, MPI_Fint *keyval, MPI_Fint *ierr)
     MPI_Comm c_comm;
     c_comm = PMPI_Comm_f2c(*comm);
 
-    c_ierr = PMPI_Attr_delete(c_comm, OMPI_FINT_2_INT(*keyval));
+    c_ierr = OMPI_FORTRAN_FPTR(MPI_Attr_delete)(c_comm, OMPI_FINT_2_INT(*keyval));
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
 }
diff --git a/ompi/mpi/fortran/mpif-h/barrier_f.c b/ompi/mpi/fortran/mpif-h/barrier_f.c
@@ -73,6 +73,6 @@ void ompi_barrier_f(MPI_Fint *comm, MPI_Fint *ierr)
 
     c_comm = PMPI_Comm_f2c(*comm);
 
-    ierr_c = PMPI_Barrier(c_comm);
+    ierr_c = OMPI_FORTRAN_FPTR(MPI_Barrier)(c_comm);
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c);
 }
diff --git a/ompi/mpi/fortran/mpif-h/bcast_f.c b/ompi/mpi/fortran/mpif-h/bcast_f.c
@@ -77,7 +77,7 @@ void ompi_bcast_f(char *buffer, MPI_Fint *count, MPI_Fint *datatype,
     c_comm = PMPI_Comm_f2c(*comm);
     c_type = PMPI_Type_f2c(*datatype);
 
-    c_ierr = PMPI_Bcast(OMPI_F2C_BOTTOM(buffer),
+    c_ierr = OMPI_FORTRAN_FPTR(MPI_Bcast)(OMPI_F2C_BOTTOM(buffer),
                        OMPI_FINT_2_INT(*count),
                        c_type,
                        OMPI_FINT_2_INT(*root),

diff --git a/ompi/mpi/fortran/mpif-h/bindings.h b/ompi/mpi/fortran/mpif-h/bindings.h
@@ -82,4 +82,6 @@
 
 #include "ompi/mpi/fortran/base/fint_2_int.h"
 
+#include "ompi/mpi/fortran/mpif-h/use_fptrs.h"
+
 #endif /* OMPI_F77_BINDINGS_H */
diff --git a/ompi/mpi/fortran/mpif-h/bsend_f.c b/ompi/mpi/fortran/mpif-h/bsend_f.c
@@ -75,7 +75,7 @@ void ompi_bsend_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest
 
     c_comm = PMPI_Comm_f2c (*comm);
 
-    c_ierr = PMPI_Bsend(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count),
+    c_ierr = OMPI_FORTRAN_FPTR(MPI_Bsend)(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count),
                        c_type, OMPI_FINT_2_INT(*dest),
                        OMPI_FINT_2_INT(*tag), c_comm);
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);

diff --git a/ompi/mpi/fortran/mpif-h/bsend_init_f.c b/ompi/mpi/fortran/mpif-h/bsend_init_f.c
@@ -76,7 +76,7 @@ void ompi_bsend_init_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint
 
     c_comm = PMPI_Comm_f2c (*comm);
 
-    c_ierr = PMPI_Bsend_init(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count),
+    c_ierr = OMPI_FORTRAN_FPTR(MPI_Bsend_init)(OMPI_F2C_BOTTOM(buf), OMPI_FINT_2_INT(*count),
                             c_type,
                             OMPI_FINT_2_INT(*dest),
                             OMPI_FINT_2_INT(*tag),

diff --git a/ompi/mpi/fortran/mpif-h/buffer_attach_f.c b/ompi/mpi/fortran/mpif-h/buffer_attach_f.c
@@ -68,6 +68,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_BUFFER_ATTACH,
 
 void ompi_buffer_attach_f(char *buffer, MPI_Fint *size, MPI_Fint *ierr)
 {
-   int c_ierr = PMPI_Buffer_attach(buffer, OMPI_FINT_2_INT(*size));
+   int c_ierr = OMPI_FORTRAN_FPTR(MPI_Buffer_attach)(buffer, OMPI_FINT_2_INT(*size));
    if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
 }
diff --git a/ompi/mpi/fortran/mpif-h/buffer_detach_f.c b/ompi/mpi/fortran/mpif-h/buffer_detach_f.c
@@ -84,7 +84,7 @@ void ompi_buffer_detach_f(char *buffer, MPI_Fint *size, MPI_Fint *ierr)
     void *dummy;
     OMPI_SINGLE_NAME_DECL(size);
 
-    c_ierr = PMPI_Buffer_detach(&dummy, OMPI_SINGLE_NAME_CONVERT(size));
+    c_ierr = OMPI_FORTRAN_FPTR(MPI_Buffer_detach)(&dummy, OMPI_SINGLE_NAME_CONVERT(size));
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
 
     if (MPI_SUCCESS == c_ierr) {

diff --git a/ompi/mpi/fortran/mpif-h/cancel_f.c b/ompi/mpi/fortran/mpif-h/cancel_f.c
@@ -73,6 +73,6 @@ void ompi_cancel_f(MPI_Fint *request, MPI_Fint *ierr)
     int c_ierr;
     MPI_Request c_req = PMPI_Request_f2c(*request);
 
-    c_ierr = PMPI_Cancel(&c_req);
+    c_ierr = OMPI_FORTRAN_FPTR(MPI_Cancel)(&c_req);
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
 }
diff --git a/ompi/mpi/fortran/mpif-h/cart_coords_f.c b/ompi/mpi/fortran/mpif-h/cart_coords_f.c
@@ -76,7 +76,7 @@ void ompi_cart_coords_f(MPI_Fint *comm, MPI_Fint *rank, MPI_Fint *maxdims,
     c_comm = PMPI_Comm_f2c(*comm);
 
     OMPI_ARRAY_FINT_2_INT_ALLOC(coords, OMPI_FINT_2_INT(*maxdims));
-    c_ierr = PMPI_Cart_coords(c_comm,
+    c_ierr = OMPI_FORTRAN_FPTR(MPI_Cart_coords)(c_comm,
                              OMPI_FINT_2_INT(*rank),
                              OMPI_FINT_2_INT(*maxdims),
                              OMPI_ARRAY_NAME_CONVERT(coords));

diff --git a/ompi/mpi/fortran/mpif-h/cart_create_f.c b/ompi/mpi/fortran/mpif-h/cart_create_f.c
@@ -81,7 +81,7 @@ void ompi_cart_create_f(MPI_Fint *old_comm, MPI_Fint *ndims, MPI_Fint *dims,
     OMPI_ARRAY_FINT_2_INT(dims, size);
     OMPI_ARRAY_LOGICAL_2_INT(periods, size);
 
-    c_ierr = PMPI_Cart_create(c_comm1, size,
+    c_ierr = OMPI_FORTRAN_FPTR(MPI_Cart_create)(c_comm1, size,
                              OMPI_ARRAY_NAME_CONVERT(dims),
                              OMPI_LOGICAL_ARRAY_NAME_CONVERT(periods),
                              OMPI_LOGICAL_2_INT(*reorder),

diff --git a/ompi/mpi/fortran/mpif-h/cart_get_f.c b/ompi/mpi/fortran/mpif-h/cart_get_f.c
@@ -82,7 +82,7 @@ void ompi_cart_get_f(MPI_Fint *comm, MPI_Fint *maxdims, MPI_Fint *dims,
     OMPI_ARRAY_FINT_2_INT_ALLOC(coords, size);
     OMPI_ARRAY_LOGICAL_2_INT_ALLOC(periods, size);
 
-    c_ierr = PMPI_Cart_get(c_comm,
+    c_ierr = OMPI_FORTRAN_FPTR(MPI_Cart_get)(c_comm,
                           size,
                           OMPI_ARRAY_NAME_CONVERT(dims),
                           OMPI_LOGICAL_ARRAY_NAME_CONVERT(periods),

diff --git a/ompi/mpi/fortran/mpif-h/cart_map_f.c b/ompi/mpi/fortran/mpif-h/cart_map_f.c
@@ -81,7 +81,7 @@ void ompi_cart_map_f(MPI_Fint *comm, MPI_Fint *ndims, MPI_Fint *dims,
     OMPI_ARRAY_FINT_2_INT(dims, size);
     OMPI_ARRAY_LOGICAL_2_INT(periods, size);
 
-    c_ierr = PMPI_Cart_map(c_comm,
+    c_ierr = OMPI_FORTRAN_FPTR(MPI_Cart_map)(c_comm,
                           size,
                           OMPI_ARRAY_NAME_CONVERT(dims),
                           OMPI_LOGICAL_ARRAY_NAME_CONVERT(periods),

diff --git a/ompi/mpi/fortran/mpif-h/cart_rank_f.c b/ompi/mpi/fortran/mpif-h/cart_rank_f.c
@@ -83,7 +83,7 @@ void ompi_cart_rank_f(MPI_Fint *comm, MPI_Fint *coords, MPI_Fint *rank,
     }
     OMPI_ARRAY_FINT_2_INT(coords, ndims);
 
-    c_ierr = PMPI_Cart_rank(c_comm,
+    c_ierr = OMPI_FORTRAN_FPTR(MPI_Cart_rank)(c_comm,
                            OMPI_ARRAY_NAME_CONVERT(coords),
                            OMPI_SINGLE_NAME_CONVERT(rank));
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);

diff --git a/ompi/mpi/fortran/mpif-h/cart_shift_f.c b/ompi/mpi/fortran/mpif-h/cart_shift_f.c
@@ -77,7 +77,7 @@ void ompi_cart_shift_f(MPI_Fint *comm, MPI_Fint *direction, MPI_Fint *disp,
 
     c_comm = PMPI_Comm_f2c(*comm);
 
-    c_ierr = PMPI_Cart_shift(c_comm,
+    c_ierr = OMPI_FORTRAN_FPTR(MPI_Cart_shift)(c_comm,
                             OMPI_FINT_2_INT(*direction),
                             OMPI_FINT_2_INT(*disp),
                             OMPI_SINGLE_NAME_CONVERT(rank_source),

diff --git a/ompi/mpi/fortran/mpif-h/cart_sub_f.c b/ompi/mpi/fortran/mpif-h/cart_sub_f.c
@@ -92,7 +92,7 @@ void ompi_cart_sub_f(MPI_Fint *comm, ompi_fortran_logical_t *remain_dims,
 #endif
     OMPI_ARRAY_LOGICAL_2_INT(remain_dims, ndims);
 
-    c_ierr = PMPI_Cart_sub(c_comm,
+    c_ierr = OMPI_FORTRAN_FPTR(MPI_Cart_sub)(c_comm,
                           OMPI_LOGICAL_ARRAY_NAME_CONVERT(remain_dims),
                           &c_new_comm);
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);

diff --git a/ompi/mpi/fortran/mpif-h/cartdim_get_f.c b/ompi/mpi/fortran/mpif-h/cartdim_get_f.c
@@ -74,7 +74,7 @@ void ompi_cartdim_get_f(MPI_Fint *comm, MPI_Fint *ndims, MPI_Fint *ierr)
 
     c_comm = PMPI_Comm_f2c(*comm);
 
-    c_ierr = PMPI_Cartdim_get(c_comm, OMPI_SINGLE_NAME_CONVERT(ndims));
+    c_ierr = OMPI_FORTRAN_FPTR(MPI_Cartdim_get)(c_comm, OMPI_SINGLE_NAME_CONVERT(ndims));
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
 
     if (MPI_SUCCESS == c_ierr) {

diff --git a/ompi/mpi/fortran/mpif-h/close_port_f.c b/ompi/mpi/fortran/mpif-h/close_port_f.c
@@ -73,7 +73,7 @@ void ompi_close_port_f(char *port_name, MPI_Fint *ierr, int port_name_len)
     char *c_port_name;
 
     ompi_fortran_string_f2c(port_name, port_name_len, &c_port_name);
-    c_ierr = PMPI_Close_port(c_port_name);
+    c_ierr = OMPI_FORTRAN_FPTR(MPI_Close_port)(c_port_name);
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
 
     free ( c_port_name);

diff --git a/ompi/mpi/fortran/mpif-h/comm_accept_f.c b/ompi/mpi/fortran/mpif-h/comm_accept_f.c
@@ -81,7 +81,7 @@ void ompi_comm_accept_f(char *port_name, MPI_Fint *info, MPI_Fint *root,
     ompi_fortran_string_f2c(port_name, port_name_len, &c_port_name);
 
 
-    c_ierr = PMPI_Comm_accept(c_port_name, c_info,
+    c_ierr = OMPI_FORTRAN_FPTR(MPI_Comm_accept)(c_port_name, c_info,
                              OMPI_FINT_2_INT(*root),
                              c_comm, &c_new_comm);
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);

diff --git a/ompi/mpi/fortran/mpif-h/comm_call_errhandler_f.c b/ompi/mpi/fortran/mpif-h/comm_call_errhandler_f.c
@@ -74,6 +74,6 @@ void ompi_comm_call_errhandler_f(MPI_Fint *comm, MPI_Fint *errorcode,
 
    c_comm = PMPI_Comm_f2c(*comm);
 
-   c_ierr = PMPI_Comm_call_errhandler(c_comm, OMPI_FINT_2_INT(*errorcode));
+   c_ierr = OMPI_FORTRAN_FPTR(MPI_Comm_call_errhandler)(c_comm, OMPI_FINT_2_INT(*errorcode));
    if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
 }
diff --git a/ompi/mpi/fortran/mpif-h/comm_compare_f.c b/ompi/mpi/fortran/mpif-h/comm_compare_f.c
@@ -73,7 +73,7 @@ void ompi_comm_compare_f(MPI_Fint *comm1, MPI_Fint *comm2, MPI_Fint *result, MPI
     MPI_Comm c_comm2 = PMPI_Comm_f2c(*comm2);
     OMPI_SINGLE_NAME_DECL(result);
 
-    c_ierr = PMPI_Comm_compare(c_comm1, c_comm2,
+    c_ierr = OMPI_FORTRAN_FPTR(MPI_Comm_compare)(c_comm1, c_comm2,
                               OMPI_SINGLE_NAME_CONVERT(result));
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
 

diff --git a/ompi/mpi/fortran/mpif-h/comm_connect_f.c b/ompi/mpi/fortran/mpif-h/comm_connect_f.c
@@ -81,7 +81,7 @@ void ompi_comm_connect_f(char *port_name, MPI_Fint *info,
     c_info = PMPI_Info_f2c(*info);
     ompi_fortran_string_f2c(port_name, port_name_len, &c_port_name);
 
-    c_ierr = PMPI_Comm_connect(c_port_name, c_info,
+    c_ierr = OMPI_FORTRAN_FPTR(MPI_Comm_connect)(c_port_name, c_info,
                               OMPI_FINT_2_INT(*root),
                               c_comm, &c_new_comm);
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);

diff --git a/ompi/mpi/fortran/mpif-h/comm_create_f.c b/ompi/mpi/fortran/mpif-h/comm_create_f.c
@@ -72,7 +72,7 @@ void ompi_comm_create_f(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *newcomm, MPI_
     MPI_Comm c_comm = PMPI_Comm_f2c (*comm);
     MPI_Group c_group = PMPI_Group_f2c(*group);
 
-    c_ierr = PMPI_Comm_create(c_comm, c_group, &c_newcomm);
+    c_ierr = OMPI_FORTRAN_FPTR(MPI_Comm_create)(c_comm, c_group, &c_newcomm);
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
 
     if (MPI_SUCCESS == c_ierr) {

diff --git a/ompi/mpi/fortran/mpif-h/comm_create_group_f.c b/ompi/mpi/fortran/mpif-h/comm_create_group_f.c
@@ -75,7 +75,7 @@ void ompi_comm_create_group_f(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *tag, MP
     MPI_Comm c_comm = PMPI_Comm_f2c (*comm);
     MPI_Group c_group = PMPI_Group_f2c(*group);
 
-    c_ierr = PMPI_Comm_create_group (c_comm, c_group, OMPI_FINT_2_INT(*tag), &c_newcomm);
+    c_ierr = OMPI_FORTRAN_FPTR(MPI_Comm_create_group) (c_comm, c_group, OMPI_FINT_2_INT(*tag), &c_newcomm);
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
 
     if (MPI_SUCCESS == c_ierr) {

diff --git a/ompi/mpi/fortran/mpif-h/comm_delete_attr_f.c b/ompi/mpi/fortran/mpif-h/comm_delete_attr_f.c
@@ -74,6 +74,6 @@ void ompi_comm_delete_attr_f(MPI_Fint *comm, MPI_Fint *comm_keyval,
 
     c_comm = PMPI_Comm_f2c(*comm);
 
-    c_ierr = PMPI_Comm_delete_attr(c_comm, OMPI_FINT_2_INT(*comm_keyval));
+    c_ierr = OMPI_FORTRAN_FPTR(MPI_Comm_delete_attr)(c_comm, OMPI_FINT_2_INT(*comm_keyval));
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
 }
diff --git a/ompi/mpi/fortran/mpif-h/comm_disconnect_f.c b/ompi/mpi/fortran/mpif-h/comm_disconnect_f.c
@@ -73,7 +73,7 @@ void ompi_comm_disconnect_f(MPI_Fint *comm, MPI_Fint *ierr)
 
     c_comm = PMPI_Comm_f2c(*comm);
 
-    c_ierr = PMPI_Comm_disconnect(&c_comm);
+    c_ierr = OMPI_FORTRAN_FPTR(MPI_Comm_disconnect)(&c_comm);
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
 
     if (MPI_SUCCESS == c_ierr) {

diff --git a/ompi/mpi/fortran/mpif-h/comm_dup_f.c b/ompi/mpi/fortran/mpif-h/comm_dup_f.c
@@ -72,7 +72,7 @@ void ompi_comm_dup_f(MPI_Fint *comm, MPI_Fint *newcomm, MPI_Fint *ierr)
     MPI_Comm c_newcomm;
     MPI_Comm c_comm = PMPI_Comm_f2c(*comm);
 
-    c_ierr = PMPI_Comm_dup(c_comm, &c_newcomm);
+    c_ierr = OMPI_FORTRAN_FPTR(MPI_Comm_dup)(c_comm, &c_newcomm);
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
 
     if (MPI_SUCCESS == c_ierr) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -82,4 +82,6 @@

		#include "ompi/mpi/fortran/base/fint_2_int.h"

		#include "ompi/mpi/fortran/mpif-h/use_fptrs.h"

		#endif /* OMPI_F77_BINDINGS_H */