Fixing FORTRAN bindings in OSHMEM

This commit was SVN r29190.

oshmem/shmem/fortran/bindings.h

@@ -15,7 +15,7 @@
 #include "prototypes_shmem.h"
 #include "ompi/mpi/fortran/base/fint_2_int.h"
 
-#define OMPI_GENERATE_FORTRAN_BINDINGS(ret, \
+#define SHMEM_GENERATE_FORTRAN_BINDINGS_FUNCTION(ret, \
         upper_case, \
         single_underscore, \
         double_underscore, \
@@ -26,4 +26,15 @@ ret upper_case signature {return wrapper_function params; } \
 ret single_underscore signature {return wrapper_function params; } \
 ret double_underscore signature {return wrapper_function params; } 
 
+#define SHMEM_GENERATE_FORTRAN_BINDINGS_SUB(ret, \
+        upper_case, \
+        single_underscore, \
+        double_underscore, \
+        wrapper_function, \
+        signature, \
+        params) \
+ret upper_case signature {wrapper_function params; } \
+ret single_underscore signature {wrapper_function params; } \
+ret double_underscore signature {wrapper_function params; } 
+
 #endif /*SHMEM_FORTRAN_BINDINGS_H*/

oshmem/shmem/fortran/my_pe_f.c

@@ -13,7 +13,7 @@
 #include "oshmem/shmem/fortran/bindings.h"
 #include "oshmem/include/shmem.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (MPI_Fint,
+SHMEM_GENERATE_FORTRAN_BINDINGS_FUNCTION (MPI_Fint,
         MY_PE,
         my_pe_,
         my_pe__,

oshmem/shmem/fortran/num_pes_f.c

@@ -13,7 +13,7 @@
 #include "oshmem/shmem/fortran/bindings.h"
 #include "oshmem/include/shmem.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (MPI_Fint,
+SHMEM_GENERATE_FORTRAN_BINDINGS_FUNCTION (MPI_Fint,
         NUM_PES,
         num_pes_,
         num_pes__,

oshmem/shmem/fortran/shmem_addr_accessible_f.c

@@ -15,7 +15,7 @@
 #include "oshmem/shmem/shmem_api_logger.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (MPI_Fint,
+SHMEM_GENERATE_FORTRAN_BINDINGS_FUNCTION (MPI_Fint,
         SHMEM_ADDR_ACCESSIBLE,
         shmem_addr_accessible_,
         shmem_addr_accessible__,

oshmem/shmem/fortran/shmem_and_to_all_f.c

@@ -18,7 +18,7 @@
 #include "oshmem/proc/proc_group_cache.h"
 #include "oshmem/op/op.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_INT4_AND_TO_ALL,
         shmem_int4_and_to_all_,
         shmem_int4_and_to_all__,
@@ -26,7 +26,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nreduce, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T *pWrk, FORTRAN_POINTER_T pSync), 
         (target,source,nreduce,PE_start,logPE_stride,PE_size,pWrk,pSync) )
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_INT8_AND_TO_ALL,
         shmem_int8_and_to_all_,
         shmem_int8_and_to_all__,

oshmem/shmem/fortran/shmem_barrier_all_f.c

@@ -13,7 +13,7 @@
 #include "oshmem/shmem/fortran/bindings.h"
 #include "oshmem/include/shmem.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_BARRIER_ALL,
         shmem_barrier_all_,
         shmem_barrier_all__,

oshmem/shmem/fortran/shmem_barrier_f.c

@@ -13,7 +13,7 @@
 #include "oshmem/shmem/fortran/bindings.h"
 #include "oshmem/include/shmem.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_BARRIER,
         shmem_barrier_,
         shmem_barrier__,

oshmem/shmem/fortran/shmem_broadcast_f.c

@@ -18,7 +18,7 @@
 #include "oshmem/proc/proc_group_cache.h"
 #include "oshmem/op/op.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_BROADCAST4,
         shmem_broadcast4_,
         shmem_broadcast4__,
@@ -26,7 +26,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nlong, MPI_Fint *PE_root, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T pSync), 
         (target, source, nlong, PE_root, PE_start, logPE_stride, PE_size, pSync));
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_BROADCAST8,
         shmem_broadcast8_,
         shmem_broadcast8__,
@@ -34,7 +34,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nlong, MPI_Fint *PE_root, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T pSync), 
         (target, source, nlong, PE_root, PE_start, logPE_stride, PE_size, pSync));
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_BROADCAST32,
         shmem_broadcast32_,
         shmem_broadcast32__,
@@ -42,7 +42,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nlong, MPI_Fint *PE_root, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T pSync), 
         (target, source, nlong, PE_root, PE_start, logPE_stride, PE_size, pSync));
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_BROADCAST64,
         shmem_broadcast64_,
         shmem_broadcast64__,

oshmem/shmem/fortran/shmem_cache_f.c

@@ -15,7 +15,7 @@
 #include "oshmem/shmem/shmem_api_logger.h"
 #include "ompi/datatype/ompi_datatype.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_SET_CACHE_INV,
         shmem_set_cache_inv_,
         shmem_set_cache_inv__,
@@ -23,7 +23,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (void), 
         ());
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_SET_CACHE_LINE_INV,
         shmem_set_cache_line_inv_,
         shmem_set_cache_line_inv__,
@@ -31,7 +31,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T target), 
         (target));
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_CLEAR_CACHE_INV,
         shmem_clear_cache_inv_,
         shmem_clear_cache_inv__,
@@ -39,7 +39,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (void), 
         ());
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_CLEAR_CACHE_LINE_INV,
         shmem_clear_cache_line_inv_,
         shmem_clear_cache_line_inv__,
@@ -47,7 +47,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T target), 
         (target));
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_UDCFLUSH,
         shmem_udcflush_,
         shmem_udcflush__,
@@ -55,7 +55,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (void), 
         ());
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_UDCFLUSH_LINE,
         shmem_udcflush_line_,
         shmem_udcflush_line__,

oshmem/shmem/fortran/shmem_character_get_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_CHARACTER_GET,
         shmem_character_get_,
         shmem_character_get__,

oshmem/shmem/fortran/shmem_character_put_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_CHARACTER_PUT,
         shmem_character_put_,
         shmem_character_put__,

oshmem/shmem/fortran/shmem_collect_f.c

@@ -18,7 +18,7 @@
 #include "oshmem/proc/proc_group_cache.h"
 #include "oshmem/op/op.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_COLLECT4,
         shmem_collect4_,
         shmem_collect4__,
@@ -26,7 +26,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nlong, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T pSync), 
         (target,source,nlong,PE_start,logPE_stride,PE_size,pSync) )
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_COLLECT8,
         shmem_collect8_,
         shmem_collect8__,
@@ -34,7 +34,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nlong, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T pSync), 
         (target,source,nlong,PE_start,logPE_stride,PE_size,pSync) )
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_COLLECT32,
         shmem_collect32_,
         shmem_collect32__,
@@ -42,7 +42,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nlong, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T pSync), 
         (target,source,nlong,PE_start,logPE_stride,PE_size,pSync) )
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_COLLECT64,
         shmem_collect64_,
         shmem_collect64__,
@@ -50,7 +50,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nlong, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T pSync), 
         (target,source,nlong,PE_start,logPE_stride,PE_size,pSync) )
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_FCOLLECT4,
         shmem_fcollect4_,
         shmem_fcollect4__,
@@ -58,7 +58,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nlong, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T pSync), 
         (target,source,nlong,PE_start,logPE_stride,PE_size,pSync) )
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_FCOLLECT8,
         shmem_fcollect8_,
         shmem_fcollect8__,
@@ -66,7 +66,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nlong, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T pSync), 
         (target,source,nlong,PE_start,logPE_stride,PE_size,pSync) )
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_FCOLLECT32,
         shmem_fcollect32_,
         shmem_fcollect32__,
@@ -74,7 +74,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nlong, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T pSync), 
         (target,source,nlong,PE_start,logPE_stride,PE_size,pSync) )
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_FCOLLECT64,
         shmem_fcollect64_,
         shmem_fcollect64__,

oshmem/shmem/fortran/shmem_complex_get_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_COMPLEX_GET,
         shmem_complex_get_,
         shmem_complex_get__,

oshmem/shmem/fortran/shmem_complex_iget_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_COMPLEX_IGET,
         shmem_complex_iget_,
         shmem_complex_iget__,

oshmem/shmem/fortran/shmem_complex_iput_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_COMPLEX_IPUT,
         shmem_complex_iput_,
         shmem_complex_iput__,

oshmem/shmem/fortran/shmem_complex_put_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_COMPLEX_PUT,
         shmem_complex_put_,
         shmem_complex_put__,

oshmem/shmem/fortran/shmem_double_get_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_DOUBLE_GET,
         shmem_double_get_,
         shmem_double_get__,

oshmem/shmem/fortran/shmem_double_iget_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_DOUBLE_IGET,
         shmem_double_iget_,
         shmem_double_iget__,

oshmem/shmem/fortran/shmem_double_iput_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_DOUBLE_IPUT,
         shmem_double_iput_,
         shmem_double_iput__,

oshmem/shmem/fortran/shmem_double_put_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_DOUBLE_PUT,
         shmem_double_put_,
         shmem_double_put__,

oshmem/shmem/fortran/shmem_fence_f.c

@@ -14,7 +14,7 @@
 #include "oshmem/include/shmem.h"
 #include "oshmem/mca/spml/spml.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_FENCE,
         shmem_fence_,
         shmem_fence__,

oshmem/shmem/fortran/shmem_finalize_f.c

@@ -13,7 +13,7 @@
 #include "oshmem/shmem/fortran/bindings.h"
 #include "oshmem/include/shmem.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_FINALIZE,
         shmem_finalize_,
         shmem_finalize__,

oshmem/shmem/fortran/shmem_get128_f.c

@@ -17,7 +17,7 @@
 #include "oshmem/mca/spml/spml.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_GET128,
         shmem_get128_,
         shmem_get128__,

oshmem/shmem/fortran/shmem_get32_f.c

@@ -17,7 +17,7 @@
 #include "oshmem/mca/spml/spml.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_GET32,
         shmem_get32_,
         shmem_get32__,

oshmem/shmem/fortran/shmem_get4_f.c

@@ -17,7 +17,7 @@
 #include "oshmem/mca/spml/spml.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_GET4,
         shmem_get4_,
         shmem_get4__,

oshmem/shmem/fortran/shmem_get64_f.c

@@ -17,7 +17,7 @@
 #include "oshmem/mca/spml/spml.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_GET64,
         shmem_get64_,
         shmem_get64__,

oshmem/shmem/fortran/shmem_get8_f.c

@@ -17,7 +17,7 @@
 #include "oshmem/mca/spml/spml.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_GET8,
         shmem_get8_,
         shmem_get8__,

oshmem/shmem/fortran/shmem_getmem_f.c

@@ -17,7 +17,7 @@
 #include "oshmem/mca/spml/spml.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_GETMEM,
         shmem_getmem_,
         shmem_getmem__,

oshmem/shmem/fortran/shmem_iget128_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_IGET128,
         shmem_iget128_,
         shmem_iget128__,

oshmem/shmem/fortran/shmem_iget32_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_IGET32,
         shmem_iget32_,
         shmem_iget32__,

oshmem/shmem/fortran/shmem_iget4_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_IGET4,
         shmem_iget4_,
         shmem_iget4__,

oshmem/shmem/fortran/shmem_iget64_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_IGET64,
         shmem_iget64_,
         shmem_iget64__,

oshmem/shmem/fortran/shmem_iget8_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_IGET8,
         shmem_iget8_,
         shmem_iget8__,

oshmem/shmem/fortran/shmem_int4_add_f.c

@@ -19,7 +19,7 @@
 #include "oshmem/op/op.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_INT4_ADD,
         shmem_int4_add_,
         shmem_int4_add__,

oshmem/shmem/fortran/shmem_int4_cswap_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (ompi_fortran_integer4_t,
+SHMEM_GENERATE_FORTRAN_BINDINGS_FUNCTION (ompi_fortran_integer4_t,
         SHMEM_INT4_CSWAP,
         shmem_int4_cswap_,
         shmem_int4_cswap__,

oshmem/shmem/fortran/shmem_int4_fadd_f.c

@@ -19,7 +19,7 @@
 #include "oshmem/op/op.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (ompi_fortran_integer4_t,
+SHMEM_GENERATE_FORTRAN_BINDINGS_FUNCTION (ompi_fortran_integer4_t,
         SHMEM_INT4_FADD,
         shmem_int4_fadd_,
         shmem_int4_fadd__,

oshmem/shmem/fortran/shmem_int4_finc_f.c

@@ -19,7 +19,7 @@
 #include "oshmem/op/op.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (ompi_fortran_integer4_t,
+SHMEM_GENERATE_FORTRAN_BINDINGS_FUNCTION (ompi_fortran_integer4_t,
         SHMEM_INT4_FINC,
         shmem_int4_finc_,
         shmem_int4_finc__,

oshmem/shmem/fortran/shmem_int4_inc_f.c

@@ -19,7 +19,7 @@
 #include "oshmem/op/op.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_INT4_INC,
         shmem_int4_inc_,
         shmem_int4_inc__,

oshmem/shmem/fortran/shmem_int4_swap_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (ompi_fortran_integer4_t,
+SHMEM_GENERATE_FORTRAN_BINDINGS_FUNCTION (ompi_fortran_integer4_t,
         SHMEM_INT4_SWAP,
         shmem_int4_swap_,
         shmem_int4_swap__,

oshmem/shmem/fortran/shmem_int4_wait_f.c

@@ -16,7 +16,7 @@
 #include "oshmem/mca/spml/spml.h"
 #include "ompi/datatype/ompi_datatype.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_INT4_WAIT,
         shmem_int4_wait_,
         shmem_int4_wait__,

oshmem/shmem/fortran/shmem_int4_wait_until_f.c

@@ -16,7 +16,7 @@
 #include "oshmem/mca/spml/spml.h"
 #include "ompi/datatype/ompi_datatype.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_INT4_WAIT_UNTIL,
         shmem_int4_wait_until_,
         shmem_int4_wait_until__,

oshmem/shmem/fortran/shmem_int8_add_f.c

@@ -19,7 +19,7 @@
 #include "oshmem/op/op.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_INT8_ADD,
         shmem_int8_add_,
         shmem_int8_add__,

oshmem/shmem/fortran/shmem_int8_cswap_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (ompi_fortran_integer8_t,
+SHMEM_GENERATE_FORTRAN_BINDINGS_FUNCTION (ompi_fortran_integer8_t,
         SHMEM_INT8_CSWAP,
         shmem_int8_cswap_,
         shmem_int8_cswap__,

oshmem/shmem/fortran/shmem_int8_fadd_f.c

@@ -19,7 +19,7 @@
 #include "oshmem/op/op.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (ompi_fortran_integer8_t,
+SHMEM_GENERATE_FORTRAN_BINDINGS_FUNCTION (ompi_fortran_integer8_t,
         SHMEM_INT8_FADD,
         shmem_int8_fadd_,
         shmem_int8_fadd__,

oshmem/shmem/fortran/shmem_int8_finc_f.c

@@ -19,7 +19,7 @@
 #include "oshmem/op/op.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (ompi_fortran_integer8_t,
+SHMEM_GENERATE_FORTRAN_BINDINGS_FUNCTION (ompi_fortran_integer8_t,
         SHMEM_INT8_FINC,
         shmem_int8_finc_,
         shmem_int8_finc__,

oshmem/shmem/fortran/shmem_int8_inc_f.c

@@ -19,7 +19,7 @@
 #include "oshmem/op/op.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_INT8_INC,
         shmem_int8_inc_,
         shmem_int8_inc__,

oshmem/shmem/fortran/shmem_int8_swap_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (ompi_fortran_integer8_t,
+SHMEM_GENERATE_FORTRAN_BINDINGS_FUNCTION (ompi_fortran_integer8_t,
         SHMEM_INT8_SWAP,
         shmem_int8_swap_,
         shmem_int8_swap__,

oshmem/shmem/fortran/shmem_int8_wait_f.c

@@ -16,7 +16,7 @@
 #include "oshmem/mca/spml/spml.h"
 #include "ompi/datatype/ompi_datatype.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_INT8_WAIT,
         shmem_int8_wait_,
         shmem_int8_wait__,

oshmem/shmem/fortran/shmem_int8_wait_until_f.c

@@ -16,7 +16,7 @@
 #include "oshmem/mca/spml/spml.h"
 #include "ompi/datatype/ompi_datatype.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_INT8_WAIT_UNTIL,
         shmem_int8_wait_until_,
         shmem_int8_wait_until__,

oshmem/shmem/fortran/shmem_integer_get_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_INTEGER_GET,
         shmem_integer_get_,
         shmem_integer_get__,

oshmem/shmem/fortran/shmem_integer_iget_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_INTEGER_IGET,
         shmem_integer_iget_,
         shmem_integer_iget__,

oshmem/shmem/fortran/shmem_integer_iput_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_INTEGER_IPUT,
         shmem_integer_iput_,
         shmem_integer_iput__,

oshmem/shmem/fortran/shmem_integer_put_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_INTEGER_PUT,
         shmem_integer_put_,
         shmem_integer_put__,

oshmem/shmem/fortran/shmem_iput128_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_IPUT128,
         shmem_iput128_,
         shmem_iput128__,

oshmem/shmem/fortran/shmem_iput32_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_IPUT32,
         shmem_iput32_,
         shmem_iput32__,

oshmem/shmem/fortran/shmem_iput4_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_IPUT4,
         shmem_iput4_,
         shmem_iput4__,

oshmem/shmem/fortran/shmem_iput64_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_IPUT64,
         shmem_iput64_,
         shmem_iput64__,

oshmem/shmem/fortran/shmem_iput8_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_IPUT8,
         shmem_iput8_,
         shmem_iput8__,

oshmem/shmem/fortran/shmem_lock_f.c

@@ -16,7 +16,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "oshmem/shmem/shmem_lock.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_SET_LOCK,
         shmem_set_lock_,
         shmem_set_lock__,
@@ -24,7 +24,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T lock), 
         (lock));
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_CLEAR_LOCK,
         shmem_clear_lock_,
         shmem_clear_lock__,
@@ -32,7 +32,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T lock), 
         (lock));
 
-OMPI_GENERATE_FORTRAN_BINDINGS (MPI_Fint,
+SHMEM_GENERATE_FORTRAN_BINDINGS_FUNCTION (MPI_Fint,
         SHMEM_TEST_LOCK,
         shmem_test_lock_,
         shmem_test_lock__,

oshmem/shmem/fortran/shmem_logical_get_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_LOGICAL_GET,
         shmem_logical_get_,
         shmem_logical_get__,

oshmem/shmem/fortran/shmem_logical_iget_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_LOGICAL_IGET,
         shmem_logical_iget_,
         shmem_logical_iget__,

oshmem/shmem/fortran/shmem_logical_iput_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_LOGICAL_IPUT,
         shmem_logical_iput_,
         shmem_logical_iput__,

oshmem/shmem/fortran/shmem_logical_put_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_LOGICAL_PUT,
         shmem_logical_put_,
         shmem_logical_put__,

oshmem/shmem/fortran/shmem_max_to_all_f.c

@@ -18,7 +18,7 @@
 #include "oshmem/proc/proc_group_cache.h"
 #include "oshmem/op/op.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_INT4_MAX_TO_ALL,
         shmem_int4_max_to_all_,
         shmem_int4_max_to_all__,
@@ -26,7 +26,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nreduce, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T *pWrk, FORTRAN_POINTER_T pSync), 
         (target,source,nreduce,PE_start,logPE_stride,PE_size,pWrk,pSync) )
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_INT8_MAX_TO_ALL,
         shmem_int8_max_to_all_,
         shmem_int8_max_to_all__,
@@ -34,7 +34,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nreduce, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T *pWrk, FORTRAN_POINTER_T pSync), 
         (target,source,nreduce,PE_start,logPE_stride,PE_size,pWrk,pSync) )
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_REAL4_MAX_TO_ALL,
         shmem_real4_max_to_all_,
         shmem_real4_max_to_all__,
@@ -42,7 +42,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nreduce, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T *pWrk, FORTRAN_POINTER_T pSync), 
         (target,source,nreduce,PE_start,logPE_stride,PE_size,pWrk,pSync) )
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_REAL8_MAX_TO_ALL,
         shmem_real8_max_to_all_,
         shmem_real8_max_to_all__,
@@ -50,7 +50,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nreduce, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T *pWrk, FORTRAN_POINTER_T pSync), 
         (target,source,nreduce,PE_start,logPE_stride,PE_size,pWrk,pSync) )
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_REAL16_MAX_TO_ALL,
         shmem_real16_max_to_all_,
         shmem_real16_max_to_all__,

oshmem/shmem/fortran/shmem_min_to_all_f.c

@@ -18,7 +18,7 @@
 #include "oshmem/proc/proc_group_cache.h"
 #include "oshmem/op/op.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_INT4_MIN_TO_ALL,
         shmem_int4_min_to_all_,
         shmem_int4_min_to_all__,
@@ -26,7 +26,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nreduce, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T *pWrk, FORTRAN_POINTER_T pSync), 
         (target,source,nreduce,PE_start,logPE_stride,PE_size,pWrk,pSync) )
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_INT8_MIN_TO_ALL,
         shmem_int8_min_to_all_,
         shmem_int8_min_to_all__,
@@ -34,7 +34,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nreduce, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T *pWrk, FORTRAN_POINTER_T pSync), 
         (target,source,nreduce,PE_start,logPE_stride,PE_size,pWrk,pSync) )
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_REAL4_MIN_TO_ALL,
         shmem_real4_min_to_all_,
         shmem_real4_min_to_all__,
@@ -42,7 +42,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nreduce, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T *pWrk, FORTRAN_POINTER_T pSync), 
         (target,source,nreduce,PE_start,logPE_stride,PE_size,pWrk,pSync) )
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_REAL8_MIN_TO_ALL,
         shmem_real8_min_to_all_,
         shmem_real8_min_to_all__,

oshmem/shmem/fortran/shmem_or_to_all_f.c

@@ -18,7 +18,7 @@
 #include "oshmem/proc/proc_group_cache.h"
 #include "oshmem/op/op.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_INT4_OR_TO_ALL,
         shmem_int4_or_to_all_,
         shmem_int4_or_to_all__,
@@ -26,7 +26,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nreduce, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T *pWrk, FORTRAN_POINTER_T pSync), 
         (target,source,nreduce,PE_start,logPE_stride,PE_size,pWrk,pSync) )
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_INT8_OR_TO_ALL,
         shmem_int8_or_to_all_,
         shmem_int8_or_to_all__,

oshmem/shmem/fortran/shmem_pe_accessible_f.c

@@ -15,7 +15,7 @@
 #include "oshmem/shmem/shmem_api_logger.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (ompi_fortran_logical_t,
+SHMEM_GENERATE_FORTRAN_BINDINGS_FUNCTION (ompi_fortran_logical_t,
         SHMEM_PE_ACCESSIBLE,
         shmem_pe_accessible_,
         shmem_pe_accessible__,

oshmem/shmem/fortran/shmem_prod_to_all_f.c

@@ -18,7 +18,7 @@
 #include "oshmem/proc/proc_group_cache.h"
 #include "oshmem/op/op.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_INT4_PROD_TO_ALL,
         shmem_int4_prod_to_all_,
         shmem_int4_prod_to_all__,
@@ -26,7 +26,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nreduce, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T *pWrk, FORTRAN_POINTER_T pSync), 
         (target,source,nreduce,PE_start,logPE_stride,PE_size,pWrk,pSync) )
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_INT8_PROD_TO_ALL,
         shmem_int8_prod_to_all_,
         shmem_int8_prod_to_all__,
@@ -34,7 +34,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nreduce, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T *pWrk, FORTRAN_POINTER_T pSync), 
         (target,source,nreduce,PE_start,logPE_stride,PE_size,pWrk,pSync) )
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_REAL4_PROD_TO_ALL,
         shmem_real4_prod_to_all_,
         shmem_real4_prod_to_all__,
@@ -42,7 +42,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nreduce, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T *pWrk, FORTRAN_POINTER_T pSync), 
         (target,source,nreduce,PE_start,logPE_stride,PE_size,pWrk,pSync) )
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_REAL8_PROD_TO_ALL,
         shmem_real8_prod_to_all_,
         shmem_real8_prod_to_all__,

oshmem/shmem/fortran/shmem_ptr_f.c

@@ -15,7 +15,7 @@
 #include "oshmem/shmem/shmem_api_logger.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (FORTRAN_POINTER_T *,
+SHMEM_GENERATE_FORTRAN_BINDINGS_FUNCTION (FORTRAN_POINTER_T *,
         SHMEM_PTR,
         shmem_ptr_,
         shmem_ptr__,

oshmem/shmem/fortran/shmem_put32_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_PUT32,
         shmem_put32_,
         shmem_put32__,

oshmem/shmem/fortran/shmem_put4_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_PUT4,
         shmem_put4_,
         shmem_put4__,

oshmem/shmem/fortran/shmem_put64_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_PUT64,
         shmem_put64_,
         shmem_put64__,

oshmem/shmem/fortran/shmem_put8_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_PUT8,
         shmem_put8_,
         shmem_put8__,

oshmem/shmem/fortran/shmem_put_f.c

@@ -16,7 +16,7 @@
 #include "oshmem/runtime/runtime.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_PUT,
         shmem_put_,
         shmem_put__,

oshmem/shmem/fortran/shmem_putmem_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_PUTMEM,
         shmem_putmem_,
         shmem_putmem__,

oshmem/shmem/fortran/shmem_quiet_f.c

@@ -14,7 +14,7 @@
 #include "oshmem/include/shmem.h"
 #include "oshmem/mca/spml/spml.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_QUIET,
         shmem_quiet_,
         shmem_quiet__,

oshmem/shmem/fortran/shmem_real4_swap_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (ompi_fortran_real4_t,
+SHMEM_GENERATE_FORTRAN_BINDINGS_FUNCTION (ompi_fortran_real4_t,
         SHMEM_REAL4_SWAP,
         shmem_real4_swap_,
         shmem_real4_swap__,

oshmem/shmem/fortran/shmem_real8_swap_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (ompi_fortran_real8_t,
+SHMEM_GENERATE_FORTRAN_BINDINGS_FUNCTION (ompi_fortran_real8_t,
         SHMEM_REAL8_SWAP,
         shmem_real8_swap_,
         shmem_real8_swap__,

oshmem/shmem/fortran/shmem_real_get_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_REAL_GET,
         shmem_real_get_,
         shmem_real_get__,

oshmem/shmem/fortran/shmem_real_iget_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_REAL_IGET,
         shmem_real_iget_,
         shmem_real_iget__,

oshmem/shmem/fortran/shmem_real_iput_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_REAL_IPUT,
         shmem_real_iput_,
         shmem_real_iput__,

oshmem/shmem/fortran/shmem_real_put_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_REAL_PUT,
         shmem_real_put_,
         shmem_real_put__,

oshmem/shmem/fortran/shmem_sum_to_all_f.c

@@ -18,7 +18,7 @@
 #include "oshmem/proc/proc_group_cache.h"
 #include "oshmem/op/op.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_INT4_SUM_TO_ALL,
         shmem_int4_sum_to_all_,
         shmem_int4_sum_to_all__,
@@ -26,7 +26,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nreduce, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T *pWrk, FORTRAN_POINTER_T pSync), 
         (target,source,nreduce,PE_start,logPE_stride,PE_size,pWrk,pSync) )
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_INT8_SUM_TO_ALL,
         shmem_int8_sum_to_all_,
         shmem_int8_sum_to_all__,
@@ -34,7 +34,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nreduce, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T *pWrk, FORTRAN_POINTER_T pSync), 
         (target,source,nreduce,PE_start,logPE_stride,PE_size,pWrk,pSync) )
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_REAL4_SUM_TO_ALL,
         shmem_real4_sum_to_all_,
         shmem_real4_sum_to_all__,
@@ -42,7 +42,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nreduce, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T *pWrk, FORTRAN_POINTER_T pSync), 
         (target,source,nreduce,PE_start,logPE_stride,PE_size,pWrk,pSync) )
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_REAL8_SUM_TO_ALL,
         shmem_real8_sum_to_all_,
         shmem_real8_sum_to_all__,

oshmem/shmem/fortran/shmem_swap_f.c

@@ -18,7 +18,7 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (MPI_Fint,
+SHMEM_GENERATE_FORTRAN_BINDINGS_FUNCTION (MPI_Fint,
         SHMEM_SWAP,
         shmem_swap_,
         shmem_swap__,

oshmem/shmem/fortran/shmem_wait_f.c

@@ -16,7 +16,7 @@
 #include "oshmem/mca/spml/spml.h"
 #include "ompi/datatype/ompi_datatype.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_WAIT,
         shmem_wait_,
         shmem_wait__,

oshmem/shmem/fortran/shmem_wait_until_f.c

@@ -16,7 +16,7 @@
 #include "oshmem/mca/spml/spml.h"
 #include "ompi/datatype/ompi_datatype.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_WAIT_UNTIL,
         shmem_wait_until_,
         shmem_wait_until__,

oshmem/shmem/fortran/shmem_xor_to_all_f.c

@@ -18,7 +18,7 @@
 #include "oshmem/proc/proc_group_cache.h"
 #include "oshmem/op/op.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_INT4_XOR_TO_ALL,
         shmem_int4_xor_to_all_,
         shmem_int4_xor_to_all__,
@@ -26,7 +26,7 @@ OMPI_GENERATE_FORTRAN_BINDINGS (void,
         (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nreduce, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T *pWrk, FORTRAN_POINTER_T pSync), 
         (target,source,nreduce,PE_start,logPE_stride,PE_size,pWrk,pSync) )
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHMEM_INT8_XOR_TO_ALL,
         shmem_int8_xor_to_all_,
         shmem_int8_xor_to_all__,

oshmem/shmem/fortran/shpalloc_f.c

@@ -16,7 +16,7 @@
 #include "oshmem/runtime/runtime.h"
 #include "stdio.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHPALLOC,
         shpalloc_,
         shpalloc__,

oshmem/shmem/fortran/shpclmove_f.c

@@ -16,7 +16,7 @@
 #include "stdio.h"
 #include "oshmem/runtime/runtime.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHPCLMOVE,
         shpclmove_,
         shpclmove__,

oshmem/shmem/fortran/shpdeallc_f.c

@@ -14,7 +14,7 @@
 #include "oshmem/include/shmem.h"
 #include "oshmem/shmem/shmem_api_logger.h"
 #include "stdio.h"
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         SHPDEALLC,
         shpdeallc_,
         shpdeallc__,

oshmem/shmem/fortran/start_pes_f.c

@@ -13,7 +13,7 @@
 #include "oshmem/shmem/fortran/bindings.h"
 #include "oshmem/include/shmem.h"
 
-OMPI_GENERATE_FORTRAN_BINDINGS (void,
+SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
         START_PES,
         start_pes_,
         start_pes__,