[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b3-194-gc776314

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  c77631474f072e86c9fe761c1328c3d4cb8cc4a5 (commit)
      from  13e979b211c4d626206628f157023d9a0b0d870d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/c77631474f072e86c9fe761c1328c3d4cb8cc4a5

commit c77631474f072e86c9fe761c1328c3d4cb8cc4a5
Author: Pavan Balaji <balaji at anl.gov>
Date:   Thu Jul 9 02:08:18 2015 -0500

    Revert "Remove redundant definitions."
    
    This reverts commit 13e979b211c4d626206628f157023d9a0b0d870d.

diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h
index dc76212..f579fc3 100644
--- a/src/mpid/ch3/include/mpidimpl.h
+++ b/src/mpid/ch3/include/mpidimpl.h
@@ -837,6 +837,12 @@ typedef enum MPIDI_VC_Event
 }
 MPIDI_VC_Event_t;
 
+#ifndef HAVE_MPIDI_VCRT
+#define HAVE_MPIDI_VCRT
+typedef struct MPIDI_VCRT * MPID_VCRT;
+typedef struct MPIDI_VC * MPID_VCR;
+#endif
+
 /* number of VCs that are in MORIBUND state */
 extern int MPIDI_Failed_vc_count;
 
diff --git a/src/mpid/ch3/include/mpidpre.h b/src/mpid/ch3/include/mpidpre.h
index bea093e..6dd0481 100644
--- a/src/mpid/ch3/include/mpidpre.h
+++ b/src/mpid/ch3/include/mpidpre.h
@@ -182,8 +182,11 @@ MPIDI_CH3I_comm_t;
 
 #define MPID_DEV_COMM_DECL MPIDI_CH3I_comm_t dev;
 
+#ifndef HAVE_MPIDI_VCRT
+#define HAVE_MPIDI_VCRT
 typedef struct MPIDI_VCRT * MPID_VCRT;
 typedef struct MPIDI_VC * MPID_VCR;
+#endif
 
 #ifndef DEFINED_REQ
 #define DEFINED_REQ

-----------------------------------------------------------------------

Summary of changes:
 src/mpid/ch3/include/mpidimpl.h |    6 ++++++
 src/mpid/ch3/include/mpidpre.h  |    3 +++
 2 files changed, 9 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
MPICH primary repository