diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index f98ef9f9924e..ad33876a7dc0 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 bcb999abe03a..90ed26923058 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 a03f045b2fb2..ba47ba408d16 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;