[pypy-svn] r47470 - in pypy/dist/pypy: rlib rpython/tool

[tismer at codespeak.net]

Author: tismer
Date: Mon Oct 15 18:56:06 2007
New Revision: 47470

Modified:
   pypy/dist/pypy/rlib/rmmap.py
   pypy/dist/pypy/rpython/tool/rffi_platform.py
Log:
fixed rffi_platform.Has to check against Linkerror as well. Fixed rmmap.py to build after windows changes

Modified: pypy/dist/pypy/rlib/rmmap.py
==============================================================================
--- pypy/dist/pypy/rlib/rmmap.py	(original)
+++ pypy/dist/pypy/rlib/rmmap.py	Mon Oct 15 18:56:06 2007
@@ -216,11 +216,12 @@
         errno = rffi.cast(lltype.Signed, GetLastError())
         return os.strerror(errno)
 
+    NULL_HANDLE = rffi.cast(HANDLE, 0)
+    INVALID_HANDLE = rffi.cast(HANDLE, -1)
+
 PAGESIZE = _get_page_size()
 NULL = lltype.nullptr(PTR.TO)
 NODATA = lltype.nullptr(PTR.TO)
-NULL_HANDLE = rffi.cast(HANDLE, 0)
-INVALID_HANDLE = rffi.cast(HANDLE, -1)
 
 class MMap(object):
     def __init__(self, access):

Modified: pypy/dist/pypy/rpython/tool/rffi_platform.py
==============================================================================
--- pypy/dist/pypy/rpython/tool/rffi_platform.py	(original)
+++ pypy/dist/pypy/rpython/tool/rffi_platform.py	Mon Oct 15 18:56:06 2007
@@ -412,7 +412,8 @@
         try:
             ask_gcc(self.name + ';')
             return True
-        except distutils.errors.CompileError:
+        except (distutils.errors.CompileError,
+                distutils.errors.LinkError):
             return False
 
 # ____________________________________________________________