[pypy-svn] r74968 - in pypy/branch/fast-ctypes: . pypy/rlib

[getxsick at codespeak.net]

Author: getxsick
Date: Mon May 31 13:11:49 2010
New Revision: 74968

Modified:
   pypy/branch/fast-ctypes/   (props changed)
   pypy/branch/fast-ctypes/pypy/rlib/rdynload.py
Log:
merge r74967 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	Mon May 31 13:11:49 2010
@@ -29,10 +29,8 @@
 else: 
     pre_include_bits = []
 
-if _FREEBSD_7 or _MINGW: # no need of library or not supported?
+if _FREEBSD_7 or _WIN32:
     libraries = []
-elif _MSVC:
-    libraries = ['kernel32'] # not sure if needed
 else:
     libraries = ['dl']
 
@@ -58,9 +56,6 @@
 def external(name, args, result, **kwds):
     return rffi.llexternal(name, args, result, compilation_info=eci, **kwds)
 
-def winexternal(name, args, result):
-    return rffi.llexternal(name, args, result, compilation_info=eci, calling_conv='win')
-
 class DLOpenError(Exception):
     def __init__(self, msg):
         self.msg = msg