commit 0b047b1e354ef61d469a546011d3257dbe7e4b7f
Author: limin <limin@09bc9535-d30e-0410-b1f7-d46b20a4725c>
Date:   Sat Oct 11 23:06:51 2014 +0000

    Fix to patch
    
    Fix warnings due to unused variables
    
    
    
    git-svn-id: http://localhost/svn/mpi/mvapich2/branches/exp7@8307 09bc9535-d30e-0410-b1f7-d46b20a4725c

diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c
index a9c8d9b..fcdd826 100644
--- a/src/mpid/ch3/src/ch3u_rma_sync.c
+++ b/src/mpid/ch3/src/ch3u_rma_sync.c
@@ -1248,9 +1248,10 @@ int MPIDI_Win_fence(int assert, MPID_Win *win_ptr)
 
         if (win_ptr->shm_allocated == TRUE) {
             MPID_Comm *node_comm_ptr = NULL;
+#if defined(CHANNEL_MRAIL) || defined(CHANNEL_PSM)
 #if defined(CHANNEL_MRAIL) 
             if (likely(!win_ptr->shm_win_pt2pt)) 
-#elif defined(CHANNEL_PSM)
+#endif
             {
                 MPI_Comm shmem_comm;
 
@@ -1265,8 +1266,8 @@ int MPIDI_Win_fence(int assert, MPID_Win *win_ptr)
             /* Ensure ordering of load/store operations. */
             OPA_read_write_barrier();
 #if defined(CHANNEL_MRAIL)
-            if(likely(!win_ptr->shm_win_pt2pt)) 
-#elif defined(CHANNEL_PSM)
+            if(likely(!win_ptr->shm_win_pt2pt))
+#endif
             {
                 mpi_errno = MPIR_Barrier_impl(node_comm_ptr, &errflag);
             }
@@ -2642,10 +2643,12 @@ static int send_contig_acc_msg(MPIDI_RMA_Op_t *rma_op,
 					  MPID_Request **request) 
 {
     MPIDI_CH3_Pkt_t upkt;
+#if !defined (CHANNEL_MRAIL)
     MPIDI_CH3_Pkt_accum_t *accum_pkt = &upkt.accum;
     MPID_IOV iov[MPID_IOV_LIMIT];
-    int mpi_errno=MPI_SUCCESS;
     int iovcnt;
+#endif /* !defined (CHANNEL_MRAIL) */
+    int mpi_errno=MPI_SUCCESS;
     MPI_Aint origin_type_size;
     MPIDI_VC_t * vc;
     MPID_Comm *comm_ptr;
@@ -7517,7 +7520,6 @@ int MPIDI_CH3_PktHandler_GetResp( MPIDI_VC_t *vc ATTRIBUTE((unused)),
 {
     MPIDI_CH3_Pkt_get_resp_t * get_resp_pkt = &pkt->get_resp;
     MPID_Request *req;
-    int complete;
     char *data_buf = NULL;
     MPIDI_msg_sz_t data_len;
     int mpi_errno = MPI_SUCCESS;
@@ -7553,6 +7555,7 @@ int MPIDI_CH3_PktHandler_GetResp( MPIDI_VC_t *vc ATTRIBUTE((unused)),
         *rreqp = req;
     }
 #else /* defined(CHANNEL_MRAIL) */
+    int complete = 0;
     *rreqp = req;
     mpi_errno = MPIDI_CH3U_Receive_data_found(req, data_buf,
                                               &data_len, &complete);