Commit b13c84cf4668828ff8429ba4a2f94cd1eb574ae0
2008-02-26T17:38:15
2008-02-26 Anthony Green <green@redhat.org> Thomas Heller <theller@ctypes.org> * include/ffi.h.in: Change void (*)() to void (*)(void).
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59
diff --git a/libffi/ChangeLog.libffi b/libffi/ChangeLog.libffi
index e237ef3..b42e04b 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 5f4c1c1..1a015ae 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 ---------------------------- */