Author: Armin Rigo <[email protected]>
Branch: safe-win-mmap
Changeset: r66964:e99ed373e5e7
Date: 2013-09-15 20:23 +0200
http://bitbucket.org/pypy/pypy/changeset/e99ed373e5e7/
Log: hg merge default, again
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,6 @@
c_memcpy = llexternal("memcpy",
[VOIDP, VOIDP, SIZE_T],
lltype.Void,
- threadsafe=False
+ _nowrapper=True, 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
@@ -810,3 +810,12 @@
assert cast(LONG, x) == 65535
else:
assert cast(LONG, cast(INT, x)) == -1
+
+def test_c_memcpy():
+ p1 = str2charp("hello")
+ p2 = str2charp("WORLD")
+ c_memcpy(cast(VOIDP, p2), cast(VOIDP, p1), cast(SIZE_T, 3))
+ assert charp2str(p1) == "hello"
+ assert charp2str(p2) == "helLD"
+ free_charp(p1)
+ free_charp(p2)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
