[mpich2-commits] r5628 - mpich2/trunk

[jayesh at mcs.anl.gov]

Author: jayesh
Date: 2009-10-29 20:55:34 -0500 (Thu, 29 Oct 2009)
New Revision: 5628

Modified:
   mpich2/trunk/winconfigure.wsf
Log:
Fix the unhandled opa defn - sizeof opa ptr - on windows correctly. The fix added in r5621 was incorrect

Modified: mpich2/trunk/winconfigure.wsf
===================================================================
--- mpich2/trunk/winconfigure.wsf	2009-10-29 21:57:04 UTC (rev 5627)
+++ mpich2/trunk/winconfigure.wsf	2009-10-30 01:55:34 UTC (rev 5628)
@@ -2203,8 +2203,6 @@
                 Else
                     fout.WriteLine("#define OPA_SIZEOF_VOID_P 4")
                 End If
-            Case "SIZEOF_OPA_PTR_T"
-                fout.WriteLine("#define SIZEOF_OPA_PTR_T sizeof(OPA_ptr_t)")
             Case "inline"
                 fout.WriteLine("#define inline __inline")
             Case "restrict"
@@ -3552,6 +3550,13 @@
                                 ' Not applicable on windows
                                 Case "NO_MINUS_C_MINUS_O"
                                         fout.WriteLine("/* #undef NO_MINUS_C_MINUS_O */")
+                                ' FIXME: The size of openpa ptr should not be hardcoded...
+                                Case "SIZEOF_OPA_PTR_T"
+                                        If b64 Then
+                                            fout.WriteLine("#define SIZEOF_OPA_PTR_T 8")
+                                        Else
+                                            fout.WriteLine("#define SIZEOF_OPA_PTR_T 4")
+                                        End if
 				Case Else
 					'MsgBox("Unhandled definition <" & define & ">")
 					If appendUniqueString(unhandled_definitions, macroname) Then