[pypy-commit] pypy default: Found out that we can fix the problem with "macro=True" to ensure

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r55029:5e2a8b1e5782
Date: 2012-05-11 10:52 +0200
http://bitbucket.org/pypy/pypy/changeset/5e2a8b1e5782/

Log:	Found out that we can fix the problem with "macro=True" to ensure
	that the function call is always preprocessed by cpp.

diff --git a/pypy/rpython/module/ll_os.py b/pypy/rpython/module/ll_os.py
--- a/pypy/rpython/module/ll_os.py
+++ b/pypy/rpython/module/ll_os.py
@@ -977,7 +977,7 @@
 
         os_lseek = self.llexternal(funcname,
                                    [rffi.INT, rffi.LONGLONG, rffi.INT],
-                                   rffi.LONGLONG)
+                                   rffi.LONGLONG, macro=True)
 
         def lseek_llimpl(fd, pos, how):
             rposix.validate_fd(fd)
diff --git a/pypy/rpython/module/test/test_ll_os.py b/pypy/rpython/module/test/test_ll_os.py
--- a/pypy/rpython/module/test/test_ll_os.py
+++ b/pypy/rpython/module/test/test_ll_os.py
@@ -214,11 +214,6 @@
     raises(OSError, f, fd)
 
 def test_os_lseek():
-    if sys.maxint == 2**31-1 and not sys.platform.startswith('win'):
-        # cannot reliably test lseek() in this mode, because the lseek()
-        # that we get is the one that returns only a 32-bit integer
-        py.test.skip("cannot test lseek on 32-bit here")
-    #
     fname = str(udir.join('os_test.txt'))
     fd = os.open(fname, os.O_RDWR|os.O_CREAT, 0777)
     assert fd >= 0