[mpich2-commits] r7459 - mpich2/trunk

[jayesh at mcs.anl.gov]

Author: jayesh
Date: 2010-11-16 15:20:00 -0600 (Tue, 16 Nov 2010)
New Revision: 7459

Modified:
   mpich2/trunk/winconfigure.wsf
Log:
Undefine the aint type macro only if it is already defined

Modified: mpich2/trunk/winconfigure.wsf
===================================================================
--- mpich2/trunk/winconfigure.wsf	2010-11-16 15:28:03 UTC (rev 7458)
+++ mpich2/trunk/winconfigure.wsf	2010-11-16 21:20:00 UTC (rev 7459)
@@ -269,7 +269,7 @@
 'MPI_OFFSET_TYPEDEF     = "typedef __int64 MPI_Offset;"
 'MPI_OFFSET_TYPEDEF     = "typedef long long MPI_Offset;"
 MPI_OFFSET_TYPEDEF     = "#if defined(USE_GCC) || defined(__GNUC__)" + vbCrLf + "typedef long long MPI_Offset;" + vbCrLf + "#else" + vbCrLf + "typedef __int64 MPI_Offset;" + vbCrLf + "#endif"
-MPI_AINT64_TYPEDEF_BEGIN    = "#undef MPI_AINT64_TYPE" + vbCrLf + "#if defined(USE_GCC) || defined(__GNUC__)" + vbCrLf + "#define MPI_AINT64_TYPE long long" + vbCrLf + "#else" + vbCrLf + "#define MPI_AINT64_TYPE __int64" + vbCrLf + "#endif" + vbCrLf
+MPI_AINT64_TYPEDEF_BEGIN    = "#ifdef MPI_AINT64_TYPE" + vbCrLf + "#undef MPI_AINT64_TYPE" + vbCrLf + "#endif" + vbCrLf + "#if defined(USE_GCC) || defined(__GNUC__)" + vbCrLf + "#define MPI_AINT64_TYPE long long" + vbCrLf + "#else" + vbCrLf + "#define MPI_AINT64_TYPE __int64" + vbCrLf + "#endif" + vbCrLf
 MPI_AINT64_TYPEDEF_END = vbCrLf + "#undef MPI_AINT64_TYPE" + vbCrLf
 EXTRA_STATUS_DECL      = ""
 HAVE_ROMIO             = "#include ""mpio.h"""