From 02c521f4392d281744a926822200fd8afb90132e Mon Sep 17 00:00:00 2001
From: Jeff Sturm <jsturm@one-point.com>
Date: Sun, 24 Feb 2002 17:31:45 +0000
Subject: [PATCH] ffi.h.in: Add typedef for ffi_arg.

        * include/ffi.h.in: Add typedef for ffi_arg.
        * src/ffitest.c (main): Declare rint with ffi_arg.

From-SVN: r50006
---
 libffi/ChangeLog        |  5 +++++
 libffi/include/ffi.h.in | 10 ++++++++++
 libffi/src/ffitest.c    |  6 +-----
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index f98ef9f9924..ad33876a7dc 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-24  Jeff Sturm  <jsturm@one-point.com>
+
+	* include/ffi.h.in: Add typedef for ffi_arg.
+	* src/ffitest.c (main): Declare rint with ffi_arg.
+ 
 2002-02-21  Andreas Tobler  <toa@pop.agri.ch>
 
 	* src/powerpc/ffi_darwin.c (ffi_prep_args): Skip appropriate
diff --git a/libffi/include/ffi.h.in b/libffi/include/ffi.h.in
index bcb999abe03..90ed2692305 100644
--- a/libffi/include/ffi.h.in
+++ b/libffi/include/ffi.h.in
@@ -307,6 +307,16 @@ typedef struct {
 
 } ffi_cif;
 
+#if SIZEOF_ARG == 4
+typedef UINT32 ffi_arg;
+#else
+#if SIZEOF_ARG == 8
+typedef UINT64 ffi_arg;
+#else
+-- unsupported configuration
+#endif
+#endif
+
 /* ---- Definitions for the raw API -------------------------------------- */
 
 #if !FFI_NO_RAW_API
diff --git a/libffi/src/ffitest.c b/libffi/src/ffitest.c
index a03f045b2fb..ba47ba408d1 100644
--- a/libffi/src/ffitest.c
+++ b/libffi/src/ffitest.c
@@ -222,11 +222,7 @@ int main(/*@unused@*/ int argc, /*@unused@*/ char *argv[])
   signed int si1;
   signed int si2;
 
-#if defined(ALPHA) || defined(IA64) || defined(SPARC64) || (defined(MIPS) && (_MIPS_SIM == _ABIN32))
-  long long rint;
-#else
-  int rint;
-#endif
+  ffi_arg rint;
   long long rlonglong;
 
   ffi_type ts1_type;