2009-06-04 Andrew Haley <aph@redhat.com>

	* include/ffi.h.in: Change void (*)() to void (*)(void).
	* src/x86/ffi.c: Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@148173 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index 7f7d128..0b26cf5 100644 (file)
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,5 +1,10 @@
 2009-06-04  Andrew Haley  <aph@redhat.com>
 
+       * include/ffi.h.in: Change void (*)() to void (*)(void).
+       * src/x86/ffi.c: Likewise.
+
+2009-06-04  Andrew Haley  <aph@redhat.com>
+
        * src/powerpc/ppc_closure.S: Insert licence header.
        * src/powerpc/linux64_closure.S: Likewise.
        * src/m68k/sysv.S: Likewise.

diff --git a/libffi/include/ffi.h.in b/libffi/include/ffi.h.in
index 5f4c1c1..ea45f95 100644 (file)
--- a/libffi/include/ffi.h.in
+++ b/libffi/include/ffi.h.in
@@ -222,7 +222,7 @@ typedef ffi_raw ffi_java_raw;
 
 
 void ffi_raw_call (ffi_cif *cif,
-                  void (*fn)(),
+                  void (*fn)(void),
                   void *rvalue,
                   ffi_raw *avalue);
 
@@ -235,7 +235,7 @@ size_t ffi_raw_size (ffi_cif *cif);
 /* longs and doubles are followed by an empty 64-bit word.             */
 
 void ffi_java_raw_call (ffi_cif *cif,
-                       void (*fn)(),
+                       void (*fn)(void),
                        void *rvalue,
                        ffi_java_raw *avalue);
 
@@ -349,7 +349,7 @@ ffi_status ffi_prep_cif(ffi_cif *cif,
                        ffi_type **atypes);
 
 void ffi_call(ffi_cif *cif,
-             void (*fn)(),
+             void (*fn)(void),
              void *rvalue,
              void **avalue);
 

diff --git a/libffi/src/x86/ffi.c b/libffi/src/x86/ffi.c
index 5e09bed..2bca56e 100644 (file)
--- a/libffi/src/x86/ffi.c
+++ b/libffi/src/x86/ffi.c
@@ -180,15 +180,15 @@ ffi_status ffi_prep_cif_machdep(ffi_cif *cif)
 }
 
 extern void ffi_call_SYSV(void (*)(char *, extended_cif *), extended_cif *,
-                         unsigned, unsigned, unsigned *, void (*fn)());
+                         unsigned, unsigned, unsigned *, void (*fn)(void));
 
 #ifdef X86_WIN32
 extern void ffi_call_STDCALL(void (*)(char *, extended_cif *), extended_cif *,
-                         unsigned, unsigned, unsigned *, void (*fn)());
+                         unsigned, unsigned, unsigned *, void (*fn)(void));
 
 #endif /* X86_WIN32 */
 
-void ffi_call(ffi_cif *cif, void (*fn)(), void *rvalue, void **avalue)
+void ffi_call(ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
 {
   extended_cif ecif;
 
@@ -391,16 +391,16 @@ ffi_prep_args_raw(char *stack, extended_cif *ecif)
 
 extern void
 ffi_call_SYSV(void (*)(char *, extended_cif *), extended_cif *, unsigned, 
-             unsigned, unsigned *, void (*fn)());
+             unsigned, unsigned *, void (*fn)(void));
 
 #ifdef X86_WIN32
 extern void
 ffi_call_STDCALL(void (*)(char *, extended_cif *), extended_cif *, unsigned,
-                unsigned, unsigned *, void (*fn)());
+                unsigned, unsigned *, void (*fn)(void));
 #endif /* X86_WIN32 */
 
 void
-ffi_raw_call(ffi_cif *cif, void (*fn)(), void *rvalue, ffi_raw *fake_avalue)
+ffi_raw_call(ffi_cif *cif, void (*fn)(void), void *rvalue, ffi_raw *fake_avalue)
 {
   extended_cif ecif;
   void **avalue = (void **)fake_avalue;