1 Index: libffi/include/ffi.h.in
2 ===================================================================
3 --- libffi.orig/include/ffi.h.in
4 +++ libffi/include/ffi.h.in
5 @@ -57,7 +57,9 @@ extern "C" {
8 /* Specify which architecture libffi is configured for. */
13 /* ---- System configuration information --------------------------------- */
15 Index: libffi/src/powerpc/ffitarget.h
16 ===================================================================
17 --- libffi.orig/src/powerpc/ffitarget.h
18 +++ libffi/src/powerpc/ffitarget.h
20 /* ---- System specific configurations ----------------------------------- */
22 #if defined (POWERPC) && defined (__powerpc64__) /* linux64 */
26 #elif defined (POWERPC_DARWIN) && defined (__ppc64__) /* Darwin */
30 #elif defined (POWERPC_AIX) && defined (__64BIT__) /* AIX64 */
37 typedef unsigned long ffi_arg;
38 Index: libffi/src/s390/ffitarget.h
39 ===================================================================
40 --- libffi.orig/src/s390/ffitarget.h
41 +++ libffi/src/s390/ffitarget.h
43 #define LIBFFI_TARGET_H
45 #if defined (__s390x__)
51 /* ---- System specific configurations ----------------------------------- */
53 Index: libffi/src/sparc/ffitarget.h
54 ===================================================================
55 --- libffi.orig/src/sparc/ffitarget.h
56 +++ libffi/src/sparc/ffitarget.h
58 /* ---- System specific configurations ----------------------------------- */
60 #if defined(__arch64__) || defined(__sparcv9)
67 typedef unsigned long ffi_arg;
68 Index: libffi/ChangeLog
69 ===================================================================
70 --- libffi.orig/ChangeLog
74 * src/closures.c (selinux_enabled_check): Fix strncmp usage bug.
76 +2010-07-07 Dan HorĂ¡k <dan@danny.cz>
78 + * include/ffi.h.in: Protect #define with #ifndef.
79 + * src/powerpc/ffitarget.h: Ditto.
80 + * src/s390/ffitarget.h: Ditto.
81 + * src/sparc/ffitarget.h: Ditto.
83 2010-05-11 Dan Witte <dwitte@mozilla.com>
85 * doc/libffi.tex: Document previous change.