Author: Alex Gaynor <alex.gay...@gmail.com> Branch: Changeset: r67921:8085d3e79ef8 Date: 2013-11-09 19:01 -0800 http://bitbucket.org/pypy/pypy/changeset/8085d3e79ef8/
Log: merged upstream diff --git a/lib_pypy/cffi.egg-info b/lib_pypy/cffi.egg-info --- a/lib_pypy/cffi.egg-info +++ b/lib_pypy/cffi.egg-info @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: cffi -Version: 0.7 +Version: 0.8 Summary: Foreign Function Interface for Python calling C code. Home-page: http://cffi.readthedocs.org Author: Armin Rigo, Maciej Fijalkowski diff --git a/lib_pypy/cffi/vengine_gen.py b/lib_pypy/cffi/vengine_gen.py --- a/lib_pypy/cffi/vengine_gen.py +++ b/lib_pypy/cffi/vengine_gen.py @@ -393,7 +393,8 @@ negative = function(p) value = int(p[0]) if value < 0 and not negative: - value += (1 << (8*self.ffi.sizeof("long long"))) + BLongLong = self.ffi._typeof_locked("long long")[0] + value += (1 << (8*self.ffi.sizeof(BLongLong))) else: BFunc = self.ffi._typeof_locked(tp.get_c_name('(*)(void)', name))[0] function = module.load_function(BFunc, funcname) diff --git a/pypy/module/test_lib_pypy/cffi_tests/test_verify.py b/pypy/module/test_lib_pypy/cffi_tests/test_verify.py --- a/pypy/module/test_lib_pypy/cffi_tests/test_verify.py +++ b/pypy/module/test_lib_pypy/cffi_tests/test_verify.py @@ -708,11 +708,14 @@ def test_define_int(): ffi = FFI() ffi.cdef("#define FOO ...\n" - "\t#\tdefine\tBAR\t...\t") + "\t#\tdefine\tBAR\t...\t\n" + "#define BAZ ...\n") lib = ffi.verify("#define FOO 42\n" - "#define BAR (-44)\n") + "#define BAR (-44)\n" + "#define BAZ 0xffffffffffffffffLL\n") assert lib.FOO == 42 assert lib.BAR == -44 + assert lib.BAZ == 0xffffffffffffffff def test_access_variable(): ffi = FFI() _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit
