From 1f429ea0b702e1bcdc82f25a2a40a0ccf1615dd1 Mon Sep 17 00:00:00 2001
From: aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 9 Jun 2009 10:21:19 +0000
Subject: 2009-06-08 Andrew Haley <aph@redhat.com>
Import from libffi 3.0.8:
* doc/libffi.texi: New file.
* doc/libffi.info: Likewise.
* doc/stamp-vti: Likewise.
* man/Makefile.am: New file.
* man/ffi_call.3: New file.
* Makefile.am (EXTRA_DIST): Add src/x86/darwin64.S,
src/dlmalloc.c.
(nodist_libffi_la_SOURCES): Add X86_FREEBSD.
* configure.ac: Bump version to 3.0.8.
parisc*-*-linux*: Add.
i386-*-freebsd* | i386-*-openbsd*: Add.
powerpc-*-beos*: Add.
AM_CONDITIONAL X86_FREEBSD: Add.
AC_CONFIG_FILES: Add man/Makefile.
* include/ffi.h.in (FFI_FN): Change void (*)() to void (*)(void).
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@148309 138bc75d-0d04-0410-961f-82ee72b054a4
---
libffi/include/Makefile.in | 2 ++
libffi/include/ffi.h.in | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
(limited to 'libffi/include')
diff --git a/libffi/include/Makefile.in b/libffi/include/Makefile.in
index cfaaca7fcf4..e18baecc11b 100644
--- a/libffi/include/Makefile.in
+++ b/libffi/include/Makefile.in
@@ -181,6 +181,8 @@ X86_64_TRUE = @X86_64_TRUE@
X86_DARWIN_FALSE = @X86_DARWIN_FALSE@
X86_DARWIN_TRUE = @X86_DARWIN_TRUE@
X86_FALSE = @X86_FALSE@
+X86_FREEBSD_FALSE = @X86_FREEBSD_FALSE@
+X86_FREEBSD_TRUE = @X86_FREEBSD_TRUE@
X86_TRUE = @X86_TRUE@
X86_WIN32_FALSE = @X86_WIN32_FALSE@
X86_WIN32_TRUE = @X86_WIN32_TRUE@
diff --git a/libffi/include/ffi.h.in b/libffi/include/ffi.h.in
index ea45f954bf0..1a015ae50f1 100644
--- a/libffi/include/ffi.h.in
+++ b/libffi/include/ffi.h.in
@@ -1,5 +1,5 @@
/* -----------------------------------------------------------------*-C-*-
- libffi @VERSION@ - Copyright (c) 1996-2003, 2007 Red Hat, Inc.
+ libffi @VERSION@ - Copyright (c) 1996-2003, 2007, 2008 Red Hat, Inc.
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
@@ -354,7 +354,7 @@ void ffi_call(ffi_cif *cif,
void **avalue);
/* Useful for eliminating compiler warnings */
-#define FFI_FN(f) ((void (*)())f)
+#define FFI_FN(f) ((void (*)(void))f)
/* ---- Definitions shared with assembly code ---------------------------- */
--
cgit v1.2.1