oshmem: invoke the C PMPI_* subroutines instead of the MPI_* ones

when profiling is built.
This prevents oshmem subroutines from being wrapped twice by third
party tools (e.g. once in oshmem and once in MPI)
see discussion starting at http://www.open-mpi.org/community/lists/devel/2015/08/17842.php

Thanks to Bert Wesarg for bringing this to our attention

ompi/mpi/c/abort.c

@@ -28,11 +28,10 @@
 #include "ompi/memchecker.h"
 #include "ompi/communicator/communicator.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Abort = PMPI_Abort
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Abort PMPI_Abort
 #endif
 

ompi/mpi/c/accumulate.c

@@ -34,11 +34,10 @@
 #include "ompi/datatype/ompi_datatype_internal.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Accumulate = PMPI_Accumulate
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Accumulate PMPI_Accumulate
 #endif
 

ompi/mpi/c/add_error_class.c

@@ -28,11 +28,10 @@
 #include "ompi/communicator/communicator.h"
 #include "ompi/attribute/attribute.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Add_error_class = PMPI_Add_error_class
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Add_error_class PMPI_Add_error_class
 #endif
 

ompi/mpi/c/add_error_code.c

@@ -28,11 +28,10 @@
 #include "ompi/errhandler/errcode.h"
 #include "ompi/attribute/attribute.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Add_error_code = PMPI_Add_error_code
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Add_error_code PMPI_Add_error_code
 #endif
 

ompi/mpi/c/add_error_string.c

@@ -28,11 +28,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/errhandler/errcode.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Add_error_string = PMPI_Add_error_string
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Add_error_string PMPI_Add_error_string
 #endif
 

ompi/mpi/c/address.c

@@ -26,11 +26,10 @@
 #include "ompi/communicator/communicator.h"
 #include "ompi/errhandler/errhandler.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Address = PMPI_Address
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Address PMPI_Address
 #endif
 

ompi/mpi/c/allgather.c

@@ -33,11 +33,10 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Allgather = PMPI_Allgather
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Allgather PMPI_Allgather
 #endif
 

ompi/mpi/c/allgatherv.c

@@ -33,11 +33,10 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Allgatherv = PMPI_Allgatherv
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Allgatherv PMPI_Allgatherv
 #endif
 

ompi/mpi/c/alloc_mem.c

@@ -31,11 +31,10 @@
 #include "ompi/info/info.h"
 #include "opal/mca/mpool/mpool.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Alloc_mem = PMPI_Alloc_mem
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Alloc_mem PMPI_Alloc_mem
 #endif
 

ompi/mpi/c/allreduce.c

@@ -32,11 +32,10 @@
 #include "ompi/op/op.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Allreduce = PMPI_Allreduce
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Allreduce PMPI_Allreduce
 #endif
 

ompi/mpi/c/alltoall.c

@@ -32,11 +32,10 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Alltoall = PMPI_Alltoall
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Alltoall PMPI_Alltoall
 #endif
 

ompi/mpi/c/alltoallv.c

@@ -32,11 +32,10 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Alltoallv = PMPI_Alltoallv
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Alltoallv PMPI_Alltoallv
 #endif
 

ompi/mpi/c/alltoallw.c

@@ -32,11 +32,10 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Alltoallw = PMPI_Alltoallw
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Alltoallw PMPI_Alltoallw
 #endif
 

ompi/mpi/c/attr_delete.c

@@ -29,11 +29,10 @@
 #include "ompi/attribute/attribute.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Attr_delete = PMPI_Attr_delete
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Attr_delete PMPI_Attr_delete
 #endif
 

ompi/mpi/c/attr_get.c

@@ -28,11 +28,10 @@
 #include "ompi/attribute/attribute.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Attr_get = PMPI_Attr_get
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Attr_get PMPI_Attr_get
 #endif
 

ompi/mpi/c/attr_put.c

@@ -29,11 +29,10 @@
 #include "ompi/attribute/attribute.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Attr_put = PMPI_Attr_put
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Attr_put PMPI_Attr_put
 #endif
 

ompi/mpi/c/barrier.c

@@ -26,11 +26,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Barrier = PMPI_Barrier
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Barrier PMPI_Barrier
 #endif
 

ompi/mpi/c/bcast.c

@@ -27,11 +27,10 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Bcast = PMPI_Bcast
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Bcast PMPI_Bcast
 #endif
 

ompi/mpi/c/bsend.c

@@ -32,11 +32,10 @@
 #include "ompi/mca/pml/base/pml_base_bsend.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Bsend = PMPI_Bsend
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Bsend PMPI_Bsend
 #endif
 

ompi/mpi/c/bsend_init.c

@@ -32,11 +32,10 @@
 #include "ompi/mca/pml/base/pml_base_bsend.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Bsend_init = PMPI_Bsend_init
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Bsend_init PMPI_Bsend_init
 #endif
 

ompi/mpi/c/buffer_attach.c

@@ -27,11 +27,10 @@
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/pml/base/pml_base_bsend.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Buffer_attach = PMPI_Buffer_attach
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Buffer_attach PMPI_Buffer_attach
 #endif
 

ompi/mpi/c/buffer_detach.c

@@ -27,11 +27,10 @@
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/pml/base/pml_base_bsend.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Buffer_detach = PMPI_Buffer_detach
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Buffer_detach PMPI_Buffer_detach
 #endif
 

ompi/mpi/c/cancel.c

@@ -29,11 +29,10 @@
 #include "ompi/request/request.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Cancel = PMPI_Cancel
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Cancel PMPI_Cancel
 #endif
 

ompi/mpi/c/cart_coords.c

@@ -31,11 +31,10 @@
 #include "ompi/group/group.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Cart_coords = PMPI_Cart_coords
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Cart_coords PMPI_Cart_coords
 #endif
 

ompi/mpi/c/cart_create.c

@@ -32,11 +32,10 @@
 #include "ompi/mca/topo/base/base.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Cart_create = PMPI_Cart_create
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Cart_create PMPI_Cart_create
 #endif
 

ompi/mpi/c/cart_get.c

@@ -30,11 +30,10 @@
 #include "ompi/mca/topo/topo.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Cart_get = PMPI_Cart_get
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Cart_get PMPI_Cart_get
 #endif
 

ompi/mpi/c/cart_map.c

@@ -32,11 +32,10 @@
 #include "ompi/mca/topo/topo.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Cart_map = PMPI_Cart_map
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Cart_map PMPI_Cart_map
 #endif
 

ompi/mpi/c/cart_rank.c

@@ -32,11 +32,10 @@
 #include "ompi/mca/topo/topo.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Cart_rank = PMPI_Cart_rank
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Cart_rank PMPI_Cart_rank
 #endif
 

ompi/mpi/c/cart_shift.c

@@ -29,11 +29,10 @@
 #include "ompi/mca/topo/topo.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Cart_shift = PMPI_Cart_shift
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Cart_shift PMPI_Cart_shift
 #endif
 

ompi/mpi/c/cart_sub.c

@@ -32,11 +32,10 @@
 #include "ompi/mca/topo/topo.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Cart_sub = PMPI_Cart_sub
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Cart_sub PMPI_Cart_sub
 #endif
 

ompi/mpi/c/cartdim_get.c

@@ -29,11 +29,10 @@
 #include "ompi/mca/topo/topo.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Cartdim_get = PMPI_Cartdim_get
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Cartdim_get PMPI_Cartdim_get
 #endif
 

ompi/mpi/c/close_port.c

@@ -31,11 +31,10 @@
 #include "ompi/dpm/dpm.h"
 
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Close_port = PMPI_Close_port
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Close_port PMPI_Close_port
 #endif
 

ompi/mpi/c/comm_accept.c

@@ -34,11 +34,10 @@
 #include "ompi/dpm/dpm.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_accept = PMPI_Comm_accept
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_accept PMPI_Comm_accept
 #endif
 

ompi/mpi/c/comm_c2f.c

@@ -28,11 +28,10 @@
 #include "ompi/mpi/fortran/base/fint_2_int.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_c2f = PMPI_Comm_c2f
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_c2f PMPI_Comm_c2f
 #endif
 

ompi/mpi/c/comm_call_errhandler.c

@@ -26,11 +26,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_call_errhandler = PMPI_Comm_call_errhandler
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_call_errhandler PMPI_Comm_call_errhandler
 #endif
 

ompi/mpi/c/comm_compare.c

@@ -27,11 +27,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_compare = PMPI_Comm_compare
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_compare PMPI_Comm_compare
 #endif
 

ompi/mpi/c/comm_connect.c

@@ -34,11 +34,10 @@
 #include "ompi/dpm/dpm.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_connect = PMPI_Comm_connect
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_connect PMPI_Comm_connect
 #endif
 

ompi/mpi/c/comm_create.c

@@ -27,11 +27,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_create = PMPI_Comm_create
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_create PMPI_Comm_create
 #endif
 

ompi/mpi/c/comm_create_errhandler.c

@@ -26,11 +26,10 @@
 #include "ompi/communicator/communicator.h"
 #include "ompi/errhandler/errhandler.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_create_errhandler = PMPI_Comm_create_errhandler
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_create_errhandler PMPI_Comm_create_errhandler
 #endif
 

ompi/mpi/c/comm_create_group.c

@@ -31,11 +31,10 @@
 #include "ompi/mca/pml/pml.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_create_group = PMPI_Comm_create_group
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_create_group PMPI_Comm_create_group
 #endif
 

ompi/mpi/c/comm_create_keyval.c

@@ -27,11 +27,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/attribute/attribute.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_create_keyval = PMPI_Comm_create_keyval
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_create_keyval PMPI_Comm_create_keyval
 #endif
 

ompi/mpi/c/comm_delete_attr.c

@@ -28,11 +28,10 @@
 #include "ompi/attribute/attribute.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_delete_attr = PMPI_Comm_delete_attr
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_delete_attr PMPI_Comm_delete_attr
 #endif
 

ompi/mpi/c/comm_disconnect.c

@@ -28,11 +28,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_disconnect = PMPI_Comm_disconnect
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_disconnect PMPI_Comm_disconnect
 #endif
 

ompi/mpi/c/comm_dup.c

@@ -28,11 +28,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_dup = PMPI_Comm_dup
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_dup PMPI_Comm_dup
 #endif
 

ompi/mpi/c/comm_dup_with_info.c

@@ -31,11 +31,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_dup_with_info = PMPI_Comm_dup_with_info
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_dup_with_info PMPI_Comm_dup_with_info
 #endif
 

ompi/mpi/c/comm_f2c.c

@@ -28,11 +28,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/mpi/fortran/base/fint_2_int.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_f2c = PMPI_Comm_f2c
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_f2c PMPI_Comm_f2c
 #endif
 

ompi/mpi/c/comm_free.c

@@ -26,11 +26,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_free = PMPI_Comm_free
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_free PMPI_Comm_free
 #endif
 

ompi/mpi/c/comm_free_keyval.c

@@ -26,11 +26,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/attribute/attribute.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_free_keyval = PMPI_Comm_free_keyval
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_free_keyval PMPI_Comm_free_keyval
 #endif
 

ompi/mpi/c/comm_get_attr.c

@@ -28,11 +28,10 @@
 #include "ompi/attribute/attribute.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_get_attr = PMPI_Comm_get_attr
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_get_attr PMPI_Comm_get_attr
 #endif
 

ompi/mpi/c/comm_get_errhandler.c

@@ -27,11 +27,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_get_errhandler = PMPI_Comm_get_errhandler
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_get_errhandler PMPI_Comm_get_errhandler
 #endif
 

ompi/mpi/c/comm_get_info.c

@@ -20,11 +20,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_get_info = PMPI_Comm_get_info
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_get_info PMPI_Comm_get_info
 #endif
 

ompi/mpi/c/comm_get_name.c

@@ -31,11 +31,10 @@
 #include "opal/threads/mutex.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_get_name = PMPI_Comm_get_name
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_get_name PMPI_Comm_get_name
 #endif
 

ompi/mpi/c/comm_get_parent.c

@@ -25,11 +25,10 @@
 #include "ompi/communicator/communicator.h"
 #include "ompi/errhandler/errhandler.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_get_parent = PMPI_Comm_get_parent
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_get_parent PMPI_Comm_get_parent
 #endif
 

ompi/mpi/c/comm_group.c

@@ -27,11 +27,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_group = PMPI_Comm_group
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_group PMPI_Comm_group
 #endif
 

ompi/mpi/c/comm_idup.c

@@ -31,11 +31,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_idup = PMPI_Comm_idup
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_idup PMPI_Comm_idup
 #endif
 

ompi/mpi/c/comm_join.c

@@ -43,11 +43,10 @@
 #include "ompi/dpm/dpm.h"
 
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_join = PMPI_Comm_join
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_join PMPI_Comm_join
 #endif
 

ompi/mpi/c/comm_rank.c

@@ -27,11 +27,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_rank = PMPI_Comm_rank
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_rank PMPI_Comm_rank
 #endif
 

ompi/mpi/c/comm_remote_group.c

@@ -28,11 +28,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_remote_group = PMPI_Comm_remote_group
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_remote_group PMPI_Comm_remote_group
 #endif
 

ompi/mpi/c/comm_remote_size.c

@@ -27,11 +27,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_remote_size = PMPI_Comm_remote_size
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_remote_size PMPI_Comm_remote_size
 #endif
 

ompi/mpi/c/comm_set_attr.c

@@ -28,11 +28,10 @@
 #include "ompi/attribute/attribute.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_set_attr = PMPI_Comm_set_attr
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_set_attr PMPI_Comm_set_attr
 #endif
 

ompi/mpi/c/comm_set_errhandler.c

@@ -26,11 +26,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_set_errhandler = PMPI_Comm_set_errhandler
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_set_errhandler PMPI_Comm_set_errhandler
 #endif
 

ompi/mpi/c/comm_set_info.c

@@ -20,11 +20,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_set_info = PMPI_Comm_set_info
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_set_info PMPI_Comm_set_info
 #endif
 

ompi/mpi/c/comm_set_name.c

@@ -33,11 +33,10 @@
 #include "ompi/totalview.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_set_name = PMPI_Comm_set_name
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_set_name PMPI_Comm_set_name
 #endif
 
@@ -74,10 +73,6 @@ int MPI_Comm_set_name(MPI_Comm comm, const char *name)
   /* Force TotalView DLL to take note of this name setting */
 
   ++ompi_tv_comm_sequence_number;
-#endif
-
-#if OMPI_BUILD_MPI_PROFILING
-#define MPI_Comm_set_name PMPI_Comm_set_name
 #endif
    OMPI_ERRHANDLER_RETURN(rc, comm, rc, FUNC_NAME);
 }

ompi/mpi/c/comm_size.c

@@ -29,11 +29,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_size = PMPI_Comm_size
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_size PMPI_Comm_size
 #endif
 

ompi/mpi/c/comm_spawn.c

@@ -34,11 +34,10 @@
 #include "ompi/dpm/dpm.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_spawn = PMPI_Comm_spawn
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_spawn PMPI_Comm_spawn
 #endif
 

ompi/mpi/c/comm_spawn_multiple.c

@@ -34,11 +34,10 @@
 #include "ompi/dpm/dpm.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_spawn_multiple = PMPI_Comm_spawn_multiple
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_spawn_multiple PMPI_Comm_spawn_multiple
 #endif
 

ompi/mpi/c/comm_split.c

@@ -27,11 +27,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_split = PMPI_Comm_split
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_split PMPI_Comm_split
 #endif
 

ompi/mpi/c/comm_split_type.c

@@ -30,11 +30,10 @@
 #include "ompi/info/info.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_split_type = PMPI_Comm_split_type
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_split_type PMPI_Comm_split_type
 #endif
 

ompi/mpi/c/comm_test_inter.c

@@ -27,11 +27,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Comm_test_inter = PMPI_Comm_test_inter
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Comm_test_inter PMPI_Comm_test_inter
 #endif
 

ompi/mpi/c/compare_and_swap.c

@@ -30,11 +30,10 @@
 #include "ompi/mca/osc/osc.h"
 #include "ompi/datatype/ompi_datatype.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Compare_and_swap = PMPI_Compare_and_swap
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Compare_and_swap PMPI_Compare_and_swap
 #endif
 

ompi/mpi/c/dims_create.c

@@ -31,11 +31,10 @@
 #include "ompi/communicator/communicator.h"
 #include "ompi/errhandler/errhandler.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Dims_create = PMPI_Dims_create
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Dims_create PMPI_Dims_create
 #endif
 

ompi/mpi/c/dist_graph_create.c

@@ -24,11 +24,10 @@
 #include "ompi/mca/topo/topo.h"
 #include "ompi/mca/topo/base/base.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Dist_graph_create = PMPI_Dist_graph_create
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Dist_graph_create PMPI_Dist_graph_create
 #endif
 

ompi/mpi/c/dist_graph_create_adjacent.c

@@ -30,11 +30,10 @@
 #include "ompi/mca/topo/topo.h"
 #include "ompi/mca/topo/base/base.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Dist_graph_create_adjacent = PMPI_Dist_graph_create_adjacent
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Dist_graph_create_adjacent PMPI_Dist_graph_create_adjacent
 #endif
 

ompi/mpi/c/dist_graph_neighbors.c

@@ -25,11 +25,10 @@
 #include "ompi/mca/topo/topo.h"
 #include "ompi/mca/topo/base/base.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Dist_graph_neighbors = PMPI_Dist_graph_neighbors
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Dist_graph_neighbors PMPI_Dist_graph_neighbors
 #endif
 

ompi/mpi/c/dist_graph_neighbors_count.c

@@ -27,11 +27,10 @@
 #include "ompi/mca/topo/topo.h"
 #include "ompi/mca/topo/base/base.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Dist_graph_neighbors_count = PMPI_Dist_graph_neighbors_count
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Dist_graph_neighbors_count PMPI_Dist_graph_neighbors_count
 #endif
 

ompi/mpi/c/errhandler_c2f.c

@@ -26,11 +26,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/mpi/fortran/base/fint_2_int.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Errhandler_c2f = PMPI_Errhandler_c2f
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Errhandler_c2f PMPI_Errhandler_c2f
 #endif
 

ompi/mpi/c/errhandler_create.c

@@ -24,11 +24,10 @@
 #include "ompi/communicator/communicator.h"
 #include "ompi/errhandler/errhandler.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Errhandler_create = PMPI_Errhandler_create
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Errhandler_create PMPI_Errhandler_create
 #endif
 

ompi/mpi/c/errhandler_f2c.c

@@ -27,11 +27,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/mpi/fortran/base/fint_2_int.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Errhandler_f2c = PMPI_Errhandler_f2c
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Errhandler_f2c PMPI_Errhandler_f2c
 #endif
 

ompi/mpi/c/errhandler_free.c

@@ -25,11 +25,10 @@
 #include "ompi/communicator/communicator.h"
 #include "ompi/errhandler/errhandler.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Errhandler_free = PMPI_Errhandler_free
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Errhandler_free PMPI_Errhandler_free
 #endif
 

ompi/mpi/c/errhandler_get.c

@@ -26,11 +26,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Errhandler_get = PMPI_Errhandler_get
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Errhandler_get PMPI_Errhandler_get
 #endif
 

ompi/mpi/c/errhandler_set.c

@@ -26,11 +26,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Errhandler_set = PMPI_Errhandler_set
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Errhandler_set PMPI_Errhandler_set
 #endif
 

ompi/mpi/c/error_class.c

@@ -26,11 +26,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/errhandler/errcode.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Error_class = PMPI_Error_class
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Error_class PMPI_Error_class
 #endif
 

ompi/mpi/c/error_string.c

@@ -27,11 +27,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/errhandler/errcode.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Error_string = PMPI_Error_string
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Error_string PMPI_Error_string
 #endif
 

ompi/mpi/c/exscan.c

@@ -31,11 +31,10 @@
 #include "ompi/op/op.h"
 #include "ompi/memchecker.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Exscan = PMPI_Exscan
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Exscan PMPI_Exscan
 #endif
 

ompi/mpi/c/fetch_and_op.c

@@ -30,11 +30,10 @@
 #include "ompi/mca/osc/osc.h"
 #include "ompi/datatype/ompi_datatype.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_Fetch_and_op = PMPI_Fetch_and_op
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_Fetch_and_op PMPI_Fetch_and_op
 #endif
 

ompi/mpi/c/file_c2f.c

@@ -27,11 +27,10 @@
 #include "ompi/mpi/fortran/base/fint_2_int.h"
 #include "ompi/file/file.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_File_c2f = PMPI_File_c2f
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_File_c2f PMPI_File_c2f
 #endif
 

ompi/mpi/c/file_call_errhandler.c

@@ -26,11 +26,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/file/file.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_File_call_errhandler = PMPI_File_call_errhandler
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_File_call_errhandler PMPI_File_call_errhandler
 #endif
 

ompi/mpi/c/file_close.c

@@ -25,11 +25,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/file/file.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_File_close = PMPI_File_close
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_File_close PMPI_File_close
 #endif
 

ompi/mpi/c/file_create_errhandler.c

@@ -27,11 +27,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/file/file.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_File_create_errhandler = PMPI_File_create_errhandler
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_File_create_errhandler PMPI_File_create_errhandler
 #endif
 

ompi/mpi/c/file_delete.c

@@ -31,11 +31,10 @@
 #include "ompi/mca/io/io.h"
 #include "ompi/mca/io/base/base.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_File_delete = PMPI_File_delete
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_File_delete PMPI_File_delete
 #endif
 

ompi/mpi/c/file_f2c.c

@@ -28,11 +28,10 @@
 #include "ompi/mpi/fortran/base/fint_2_int.h"
 #include "ompi/file/file.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_File_f2c = PMPI_File_f2c
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_File_f2c PMPI_File_f2c
 #endif
 

ompi/mpi/c/file_get_amode.c

@@ -26,11 +26,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/file/file.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_File_get_amode = PMPI_File_get_amode
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_File_get_amode PMPI_File_get_amode
 #endif
 

ompi/mpi/c/file_get_atomicity.c

@@ -26,11 +26,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/file/file.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_File_get_atomicity = PMPI_File_get_atomicity
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_File_get_atomicity PMPI_File_get_atomicity
 #endif
 

ompi/mpi/c/file_get_byte_offset.c

@@ -26,11 +26,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/file/file.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_File_get_byte_offset = PMPI_File_get_byte_offset
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_File_get_byte_offset PMPI_File_get_byte_offset
 #endif
 

ompi/mpi/c/file_get_errhandler.c

@@ -27,11 +27,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/file/file.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_File_get_errhandler = PMPI_File_get_errhandler
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_File_get_errhandler PMPI_File_get_errhandler
 #endif
 

ompi/mpi/c/file_get_group.c

@@ -26,11 +26,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/file/file.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_File_get_group = PMPI_File_get_group
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_File_get_group PMPI_File_get_group
 #endif
 

ompi/mpi/c/file_get_info.c

@@ -26,11 +26,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/file/file.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_File_get_info = PMPI_File_get_info
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_File_get_info PMPI_File_get_info
 #endif
 

ompi/mpi/c/file_get_position.c

@@ -26,11 +26,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/file/file.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_File_get_position = PMPI_File_get_position
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_File_get_position PMPI_File_get_position
 #endif
 

ompi/mpi/c/file_get_position_shared.c

@@ -26,11 +26,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/file/file.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_File_get_position_shared = PMPI_File_get_position_shared
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_File_get_position_shared PMPI_File_get_position_shared
 #endif
 

ompi/mpi/c/file_get_size.c

@@ -26,11 +26,10 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/file/file.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_File_get_size = PMPI_File_get_size
 #endif
-
-#if OMPI_BUILD_MPI_PROFILING
 #define MPI_File_get_size PMPI_File_get_size
 #endif