From 2fbc0369b89a7e6b089e6384b98dba904ec1cf8b Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 19 Nov 2015 16:38:35 -0700 Subject: [PATCH] move ffi_prep_cif_core to ffi_common.h --- include/ffi.h.in | 9 --------- include/ffi_common.h | 10 ++++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/include/ffi.h.in b/include/ffi.h.in index 9e65277..ba1884f 100644 --- a/include/ffi.h.in +++ b/include/ffi.h.in @@ -229,15 +229,6 @@ typedef struct { #endif } ffi_cif; -/* Used internally, but overridden by some architectures */ -ffi_status ffi_prep_cif_core(ffi_cif *cif, - ffi_abi abi, - unsigned int isvariadic, - unsigned int nfixedargs, - unsigned int ntotalargs, - ffi_type *rtype, - ffi_type **atypes); - /* ---- Definitions for the raw API -------------------------------------- */ #ifndef FFI_SIZEOF_ARG diff --git a/include/ffi_common.h b/include/ffi_common.h index b312297..00eae1b 100644 --- a/include/ffi_common.h +++ b/include/ffi_common.h @@ -82,11 +82,21 @@ ffi_status ffi_prep_cif_machdep(ffi_cif *cif); ffi_status ffi_prep_cif_machdep_var(ffi_cif *cif, unsigned int nfixedargs, unsigned int ntotalargs); + #if HAVE_LONG_DOUBLE_VARIANT /* Used to adjust size/alignment of ffi types. */ void ffi_prep_types (ffi_abi abi); #endif +/* Used internally, but overridden by some architectures */ +ffi_status ffi_prep_cif_core(ffi_cif *cif, + ffi_abi abi, + unsigned int isvariadic, + unsigned int nfixedargs, + unsigned int ntotalargs, + ffi_type *rtype, + ffi_type **atypes); + /* Extended cif, used in callback from assembly routine */ typedef struct {