[pypy-svn] r76260 - pypy/branch/fast-ctypes/pypy/rlib

getxsick at codespeak.net getxsick at codespeak.net
Fri Jul 16 16:39:29 CEST 2010


Author: getxsick
Date: Fri Jul 16 16:39:27 2010
New Revision: 76260

Modified:
   pypy/branch/fast-ctypes/pypy/rlib/rdynload.py
Log:
merge r74994 from trunk


Modified: pypy/branch/fast-ctypes/pypy/rlib/rdynload.py
==============================================================================
--- pypy/branch/fast-ctypes/pypy/rlib/rdynload.py	(original)
+++ pypy/branch/fast-ctypes/pypy/rlib/rdynload.py	Fri Jul 16 16:39:27 2010
@@ -18,8 +18,6 @@
 
 if _WIN32:
     from pypy.rlib import rwin32
-
-if _WIN32:
     includes = ['windows.h']
 else:
     includes = ['dlfcn.h']
@@ -138,7 +136,7 @@
         intresource = rffi.cast(rffi.CCHARP, r_uint(index) & 0xFFFF)
         res = rwin32.GetProcAddress(handle, intresource)
         if not res:
-            raise KeyError(name)
+            raise KeyError(index)
         # XXX rffi.cast here...
         return res
     



More information about the Pypy-commit mailing list