[pypy-svn] r46289 - pypy/branch/pypy-more-rtti-inprogress/rpython/lltypesystem

[arigo at codespeak.net]

Author: arigo
Date: Mon Sep  3 18:26:55 2007
New Revision: 46289

Modified:
   pypy/branch/pypy-more-rtti-inprogress/rpython/lltypesystem/ll2ctypes.py
Log:
Attempted fix for Windows


Modified: pypy/branch/pypy-more-rtti-inprogress/rpython/lltypesystem/ll2ctypes.py
==============================================================================
--- pypy/branch/pypy-more-rtti-inprogress/rpython/lltypesystem/ll2ctypes.py	(original)
+++ pypy/branch/pypy-more-rtti-inprogress/rpython/lltypesystem/ll2ctypes.py	Mon Sep  3 18:26:55 2007
@@ -418,7 +418,13 @@
 # __________ the standard C library __________
 
 if sys.platform == 'win32':
-    standard_c_lib = ctypes.cdll.LoadLibrary('msvcrt.dll')
+    # trying to guess the correct libc... only a few tests fail if there
+    # is a mismatch between the one used by python2x.dll and the one
+    # loaded here
+    if sys.version_info < (2, 4):
+        standard_c_lib = ctypes.cdll.LoadLibrary('msvcrt.dll')
+    else:
+        standard_c_lib = ctypes.cdll.LoadLibrary('msvcr71.dll')
 else:
     standard_c_lib = ctypes.cdll.LoadLibrary(ctypes.util.find_library('c'))