From b1760f7f915a36ee9b4636fb54719c9b3ae59356 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Mon, 12 Jan 2015 08:19:59 -0800 Subject: Merge libffi to upstream commit c82cc159426d8d4402375fa1ae3f045b9cf82e16 From-SVN: r219477 --- libffi/man/Makefile.in | 6 ++++++ libffi/man/ffi_prep_cif.3 | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'libffi/man') diff --git a/libffi/man/Makefile.in b/libffi/man/Makefile.in index 743e67b7..39f6cbf 100644 --- a/libffi/man/Makefile.in +++ b/libffi/man/Makefile.in @@ -97,6 +97,10 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -149,12 +153,14 @@ SHELL = @SHELL@ STRIP = @STRIP@ TARGET = @TARGET@ TARGETDIR = @TARGETDIR@ +TARGET_OBJ = @TARGET_OBJ@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff --git a/libffi/man/ffi_prep_cif.3 b/libffi/man/ffi_prep_cif.3 index e1bdbd7..ab2be8a 100644 --- a/libffi/man/ffi_prep_cif.3 +++ b/libffi/man/ffi_prep_cif.3 @@ -61,10 +61,8 @@ does not refer to a valid ABI, .Nm FFI_BAD_ABI will be returned. Available ABIs are defined in -.Nm -. +.Nm . .Sh SEE ALSO .Xr ffi 3 , .Xr ffi_call 3 , .Xr ffi_prep_cif_var 3 - -- cgit v1.1