[mpich2-commits] r6720 - mpich2/trunk/src/include

[jayesh at mcs.anl.gov]

Author: jayesh
Date: 2010-05-24 13:47:16 -0500 (Mon, 24 May 2010)
New Revision: 6720

Modified:
   mpich2/trunk/src/include/mpiimpl.h
   mpich2/trunk/src/include/mpiimplthreadpost.h
Log:
Moving the condition for inclusion of mpiimplthreadpost header to inside the header file - Takes care of accidental include of mpiimplthreadpost without conditional check - review at goodell. Also see r6713

Modified: mpich2/trunk/src/include/mpiimpl.h
===================================================================
--- mpich2/trunk/src/include/mpiimpl.h	2010-05-24 18:38:28 UTC (rev 6719)
+++ mpich2/trunk/src/include/mpiimpl.h	2010-05-24 18:47:16 UTC (rev 6720)
@@ -3136,12 +3136,7 @@
 #define MPIU_CALL(context,funccall) context##_##funccall
 #endif
 
-#if (MPICH_THREAD_LEVEL >= MPI_THREAD_SERIALIZED)
-/* mpiimplthreadpost.h requires MPID Thread defns - that are available only
- * when thread level >= serialized
- */
 #include "mpiimplthreadpost.h"
-#endif
 
 /* Include definitions from the device which require items defined by this 
    file (mpiimpl.h). */

Modified: mpich2/trunk/src/include/mpiimplthreadpost.h
===================================================================
--- mpich2/trunk/src/include/mpiimplthreadpost.h	2010-05-24 18:38:28 UTC (rev 6719)
+++ mpich2/trunk/src/include/mpiimplthreadpost.h	2010-05-24 18:47:16 UTC (rev 6720)
@@ -11,6 +11,10 @@
 #ifndef MPIIMPLTHREADPOST_H_INCLUDED
 #define MPIIMPLTHREADPOST_H_INCLUDED
 
+#if (MPICH_THREAD_LEVEL >= MPI_THREAD_SERIALIZED)
+/* All the funcs below require MPID Thread defns - that are available only
+ * when thread level >= serialized
+ */
 #undef FUNCNAME
 #define FUNCNAME MPIU_Thread_CS_enter_lockname_impl_
 #undef FCNAME
@@ -75,6 +79,7 @@
 #undef FUNCNAME
 #undef FCNAME
 
+#endif /*  (MPICH_THREAD_LEVEL >= MPI_THREAD_SERIALIZED) */
 
 #endif /* defined(MPIIMPLTHREADPOST_H_INCLUDED) */