[MOAB-dev] r4046 - MOAB/trunk/src/parallel

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-07-08 14:47:46 -0500 (Thu, 08 Jul 2010)
New Revision: 4046

Modified:
   MOAB/trunk/src/parallel/moab_mpi.h
Log:
make previous netcdf workaround a little more robust

Modified: MOAB/trunk/src/parallel/moab_mpi.h
===================================================================
--- MOAB/trunk/src/parallel/moab_mpi.h	2010-07-08 17:02:05 UTC (rev 4045)
+++ MOAB/trunk/src/parallel/moab_mpi.h	2010-07-08 19:47:46 UTC (rev 4046)
@@ -3,10 +3,12 @@
 #include "moab_mpi_config.h"
 
 /* Work around brain-dead netcdf.h */
-#undef MPI_Comm
-#undef MPI_Info
-#undef MPI_COMM_WORLD
-#undef MPI_INFO_NULL
+#ifndef MPI_INCLUDED
+#  undef MPI_Comm
+#  undef MPI_Info
+#  undef MPI_COMM_WORLD
+#  undef MPI_INFO_NULL
+#endif
 
 #ifndef __cplusplus
 #  include <mpi.h>