OSHMEM: revert r31412, it did not pass jenkins

This commit was SVN r31414.

The following SVN revision numbers were found above:
  r31412 --> open-mpi/ompi@b0ade11ae4

oshmem/shmem/c/shmem_barrier.c

@@ -24,7 +24,6 @@
 #if OSHMEM_PROFILING
 #include "oshmem/include/pshmem.h"
 #pragma weak shmem_barrier = pshmem_barrier
-#pragma weak shmem_barrier_all = pshmem_barrier_all
 #include "oshmem/shmem/c/profile/defines.h"
 #endif
 
@@ -75,6 +74,10 @@ void shmem_barrier(int PE_start, int logPE_stride, int PE_size, long *pSync)
     RUNTIME_CHECK_RC(rc);
 }
 
+#if OSHMEM_PROFILING
+#pragma weak shmem_barrier_all = pshmem_barrier_all
+#endif
+
 void shmem_barrier_all(void)
 {
     int rc = OSHMEM_SUCCESS;

oshmem/shmem/c/shmem_get.c

@@ -52,6 +52,7 @@
 #pragma weak shmem_float_get = pshmem_float_get
 #pragma weak shmem_double_get = pshmem_double_get
 #pragma weak shmem_longdouble_get = pshmem_longdouble_get
+#include "oshmem/shmem/c/profile/defines.h"
 #endif
 
 SHMEM_TYPE_GET(_char, char)
@@ -89,7 +90,6 @@ SHMEM_TYPE_GET(_longdouble, long double)
 #pragma weak shmem_get32 = pshmem_get32
 #pragma weak shmem_get64 = pshmem_get64
 #pragma weak shmem_get128 = pshmem_get128
-#include "oshmem/shmem/c/profile/defines.h"
 #endif
 
 SHMEM_TYPE_GETMEM(_getmem, 1)