[pypy-commit] pypy safe-win-mmap: hg merge default

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: safe-win-mmap
Changeset: r66966:d2932fe55f26
Date: 2013-09-15 20:48 +0200
http://bitbucket.org/pypy/pypy/changeset/d2932fe55f26/

Log:	hg merge default

diff --git a/rpython/rtyper/lltypesystem/rffi.py b/rpython/rtyper/lltypesystem/rffi.py
--- a/rpython/rtyper/lltypesystem/rffi.py
+++ b/rpython/rtyper/lltypesystem/rffi.py
@@ -1138,6 +1138,5 @@
 c_memcpy = llexternal("memcpy",
             [VOIDP, VOIDP, SIZE_T],
             lltype.Void,
-            _nowrapper=True, releasegil=False
+            releasegil=False
         )
-
diff --git a/rpython/rtyper/lltypesystem/test/test_rffi.py b/rpython/rtyper/lltypesystem/test/test_rffi.py
--- a/rpython/rtyper/lltypesystem/test/test_rffi.py
+++ b/rpython/rtyper/lltypesystem/test/test_rffi.py
@@ -814,7 +814,7 @@
 def test_c_memcpy():
     p1 = str2charp("hello")
     p2 = str2charp("WORLD")
-    c_memcpy(cast(VOIDP, p2), cast(VOIDP, p1), cast(SIZE_T, 3))
+    c_memcpy(cast(VOIDP, p2), cast(VOIDP, p1), 3)
     assert charp2str(p1) == "hello"
     assert charp2str(p2) == "helLD"
     free_charp(p1)