[pypy-svn] r54814 - pypy/dist/pypy/module/_rawffi

[fijal at codespeak.net]

Author: fijal
Date: Sat May 17 12:23:32 2008
New Revision: 54814

Modified:
   pypy/dist/pypy/module/_rawffi/interp_rawffi.py
Log:
(fijal, felix) Fix linux support


Modified: pypy/dist/pypy/module/_rawffi/interp_rawffi.py
==============================================================================
--- pypy/dist/pypy/module/_rawffi/interp_rawffi.py	(original)
+++ pypy/dist/pypy/module/_rawffi/interp_rawffi.py	Sat May 17 12:23:32 2008
@@ -9,10 +9,10 @@
 from pypy.rpython.lltypesystem import lltype, rffi
 from pypy.rlib.unroll import unrolling_iterable
 
-try:
+_MS_WINDOWS = os.name == "nt"
+
+if _MS_WINDOWS:
     from pypy.rlib import rwin32
-except:
-    rwin32 = None
 
 from pypy.tool.sourcetools import func_with_new_name
 from pypy.rlib.rarithmetic import intmask, r_uint, r_singlefloat
@@ -458,12 +458,13 @@
     return space.wrap(s)
 charp2rawstring.unwrap_spec = [ObjSpace, r_uint, int]
 
-def FormatError(space, code):
-    return space.wrap(rwin32.FormatError(code))
-FormatError.unwrap_spec = [ObjSpace, int]
-
-def check_HRESULT(space, hresult):
-    if rwin32.FAILED(hresult):
-        raise OperationError(space.w_WindowsError, space.wrap(hresult))
-    return space.wrap(hresult)
-check_HRESULT.unwrap_spec = [ObjSpace, int]
+if _MS_WINDOWS:
+    def FormatError(space, code):
+        return space.wrap(rwin32.FormatError(code))
+    FormatError.unwrap_spec = [ObjSpace, int]
+
+    def check_HRESULT(space, hresult):
+        if rwin32.FAILED(hresult):
+            raise OperationError(space.w_WindowsError, space.wrap(hresult))
+        return space.wrap(hresult)
+    check_HRESULT.unwrap_spec = [ObjSpace, int]