[pypy-commit] pypy pypy3-release-2.4.x: this workaround is no longer needed

pjenvey noreply at buildbot.pypy.org
Fri Oct 17 22:12:45 CEST 2014


Author: Philip Jenvey <pjenvey at underboss.org>
Branch: pypy3-release-2.4.x
Changeset: r74004:bfc266fad6e7
Date: 2014-10-14 12:51 -0700
http://bitbucket.org/pypy/pypy/changeset/bfc266fad6e7/

Log:	this workaround is no longer needed (grafted from
	c377769fa159b855076be8cb7f5483acbc5f4e16)

diff --git a/rpython/rtyper/lltypesystem/ll2ctypes.py b/rpython/rtyper/lltypesystem/ll2ctypes.py
--- a/rpython/rtyper/lltypesystem/ll2ctypes.py
+++ b/rpython/rtyper/lltypesystem/ll2ctypes.py
@@ -361,9 +361,7 @@
             functype = ctypes.CFUNCTYPE
             if sys.platform == 'win32':
                 from rpython.rlib.clibffi import FFI_STDCALL, FFI_DEFAULT_ABI
-                # XXX:
-                #if getattr(T.TO, 'ABI', FFI_DEFAULT_ABI) == FFI_STDCALL:
-                if getattr(T.TO, 'ABI', FFI_DEFAULT_ABI) == 'FFI_STDCALL':
+                if getattr(T.TO, 'ABI', FFI_DEFAULT_ABI) == FFI_STDCALL:
                     # for win32 system call
                     functype = ctypes.WINFUNCTYPE
             argtypes = [get_ctypes_type(ARG) for ARG in T.TO.ARGS


More information about the pypy-commit mailing list