Fixed a macro issue where the macro variable name expanded to the same name of

a variable within the macro.

This commit was SVN r6084.

src/mca/pml/ob1/pml_ob1_recvfrag.h

@@ -57,7 +57,7 @@ do {                                                            \
 #define MCA_PML_OB1_RECV_FRAG_INIT(frag,bmi,hdr,segs,cnt)            \
 do {                                                            \
     size_t i;                                                   \
-    mca_bmi_base_segment_t* segments = frag->segments;          \
+    mca_bmi_base_segment_t* macro_segments = frag->segments;          \
     mca_pml_ob1_buffer_t** buffers = frag->buffers;             \
                                                                 \
     /* init recv_frag */                                         \
@@ -72,8 +72,8 @@ do {                                                            \
         OMPI_FREE_LIST_WAIT(&mca_pml_ob1.buffers, item, rc);    \
         buff = (mca_pml_ob1_buffer_t*)item;                     \
         buffers[i] = buff;                                      \
-        segments[i].seg_addr.pval = buff->addr;                 \
-        segments[i].seg_len = segs[i].seg_len;                  \
+        macro_segments[i].seg_addr.pval = buff->addr;                 \
+        macro_segments[i].seg_len = segs[i].seg_len;                  \
         memcpy(buff->addr,                                      \
                segs[i].seg_addr.pval,                           \
                segs[i].seg_len);                                \

src/mca/pml/ob1/pml_ob1_recvreq.c

@@ -437,7 +437,7 @@ void mca_pml_ob1_recv_request_match_specific(mca_pml_ob1_recv_request_t* request
     if (ompi_list_get_size(&proc->unexpected_frags) > 0 &&
         (frag = mca_pml_ob1_recv_request_match_specific_proc(request, proc)) != NULL) {
         OMPI_THREAD_UNLOCK(&comm->matching_lock);
-
+        
         mca_pml_ob1_recv_request_progress(request,frag->bmi,frag->segments,frag->num_segments);
         if( !((MCA_PML_REQUEST_IPROBE == request->req_recv.req_base.req_type) ||
               (MCA_PML_REQUEST_PROBE == request->req_recv.req_base.req_type)) ) {