Author: Armin Rigo <[email protected]>
Branch:
Changeset: r74375:aff60e5fa2b2
Date: 2014-11-07 15:51 +0100
http://bitbucket.org/pypy/pypy/changeset/aff60e5fa2b2/
Log: merge heads
diff --git a/rpython/translator/c/src/libffi_msvc/ffi.h
b/rpython/translator/c/src/libffi_msvc/ffi.h
--- a/rpython/translator/c/src/libffi_msvc/ffi.h
+++ b/rpython/translator/c/src/libffi_msvc/ffi.h
@@ -60,6 +60,7 @@
/* ---- System configuration information --------------------------------- */
+#include <src/precommondefs.h> /* for RPY_EXPORTED_FOR_TESTS */
#include <ffitarget.h>
#ifndef LIBFFI_ASM
@@ -264,12 +265,14 @@
/* ---- Public interface definition -------------------------------------- */
+RPY_EXPORTED_FOR_TESTS
ffi_status ffi_prep_cif(/*@out@*/ /*@partial@*/ ffi_cif *cif,
ffi_abi abi,
unsigned int nargs,
/*@dependent@*/ /*@out@*/ /*@partial@*/ ffi_type
*rtype,
/*@dependent@*/ ffi_type **atypes);
+RPY_EXPORTED_FOR_TESTS
int
ffi_call(/*@dependent@*/ ffi_cif *cif,
void (*fn)(),
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
