From b13c84cf4668828ff8429ba4a2f94cd1eb574ae0 Mon Sep 17 00:00:00 2001
From: green <green>
Date: Tue, 26 Feb 2008 17:38:15 +0000
Subject: [PATCH] 2008-02-26  Anthony Green  <green@redhat.org>            
 Thomas Heller <theller@ctypes.org>

        * include/ffi.h.in: Change void (*)() to void (*)(void).
---
 libffi/ChangeLog.libffi |  6 ++++++
 libffi/include/ffi.h.in | 10 +++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/libffi/ChangeLog.libffi b/libffi/ChangeLog.libffi
index e237ef35..b42e04b5 100644
--- a/libffi/ChangeLog.libffi
+++ b/libffi/ChangeLog.libffi
@@ -1,4 +1,10 @@
 2008-02-26  Anthony Green  <green@redhat.org>
+            Thomas Heller <theller@ctypes.org>
+
+	* include/ffi.h.in: Change void (*)() to void (*)(void).
+
+2008-02-26  Anthony Green  <green@redhat.org>
+            Thomas Heller <theller@ctypes.org>
 
 	* src/alpha/ffi.c: Change void (*)() to void (*)(void).
 	src/alpha/osf.S, src/arm/ffi.c, src/frv/ffi.c, src/ia64/ffi.c,
diff --git a/libffi/include/ffi.h.in b/libffi/include/ffi.h.in
index 5f4c1c1a..1a015ae5 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
@@ -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,12 +349,12 @@ 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);
 
 /* Useful for eliminating compiler warnings */
-#define FFI_FN(f) ((void (*)())f)
+#define FFI_FN(f) ((void (*)(void))f)
 
 /* ---- Definitions shared with assembly code ---------------------------- */