* include/ffi.h.in: Try to work around messy header problem

with PACKAGE and VERSION.

	* configure: Rebuilt.
	* configure.in: Change version to 2.00-beta.

        * fficonfig.h.in: Rebuilt.
	* acconfig.h (FFI_NO_STRUCTS, FFI_NO_RAW_API): Define.

	* src/x86/ffi.c (ffi_raw_call): Rename.

libffi/ChangeLog

@@ -1,3 +1,16 @@
+1999-08-09  Anthony Green  <green@cygnus.com>
+
+	* include/ffi.h.in: Try to work around messy header problem
+	with PACKAGE and VERSION.
+
+	* configure: Rebuilt.
+	* configure.in: Change version to 2.00-beta.
+
+        * fficonfig.h.in: Rebuilt.
+	* acconfig.h (FFI_NO_STRUCTS, FFI_NO_RAW_API): Define.
+
+	* src/x86/ffi.c (ffi_raw_call): Rename.
+
 1999-08-02  Kresten Krab Thorup  <krab@dominiq.is.s.u-tokyo.ac.jp>
 
 	* src/x86/ffi.c (ffi_closure_SYSV): New function.
@@ -7,7 +20,7 @@
 	(ffi_prep_raw_closure): More ditto.
 	(ffi_call_raw): Final ditto.
 
-	* include/ffi.h.in: 
+	* include/ffi.h.in: Add definitions for closure and raw API.
 
 	* src/x86/ffi.c (ffi_prep_cif_machdep): Added case for
 	FFI_TYPE_UINT64.  
@@ -61,5 +74,3 @@ Thu Jul  8 14:28:42 1999  Anthony Green  <green@cygnus.com>
 	* src/x86/ChangeLog: Removed.
 
 	* ChangeLog.v1: Created.
-	
-

libffi/acconfig.h

@@ -5,9 +5,14 @@
    spurious messages. */
 #undef USING_PURIFY
 
+/* Define this is you do not want support for aggregate types.  */
+#undef FFI_NO_STRUCTS
+
+/* Define this is you do not want support for the raw API.  */
+#undef FFI_NO_RAW_API
+
 /* This is the package name */
 #undef PACKAGE
 
 /* This is the package version */
 #undef VERSION
-

libffi/configure.in

@@ -11,7 +11,7 @@ AC_MSG_WARN(***********************************************************)
 
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(libffi,2.00)
+AM_INIT_AUTOMAKE(libffi,2.00-beta)
 
 AC_EXEEXT
 AM_MAINTAINER_MODE

libffi/fficonfig.h.in

@@ -25,6 +25,10 @@
 /* Define if you have the ANSI C header files.  */
 #undef STDC_HEADERS
 
+/* Define if your processor stores words with the most significant
+   byte first (like Motorola and SPARC, unlike Intel and VAX).  */
+#undef WORDS_BIGENDIAN
+
 /* Define this if you want extra debugging */
 #undef FFI_DEBUG
 
@@ -32,14 +36,11 @@
    spurious messages. */
 #undef USING_PURIFY
 
-/* Define this if you want the raw api disabled */
+/* Define this is you do not want support for aggregate types.  */
-#undef FFI_DISABLE_RAW_API
+#undef FFI_NO_STRUCTS
 
-/* This is the package name */
+/* Define this is you do not want support for the raw API.  */
-#undef PACKAGE
+#undef FFI_NO_RAW_API
-
-/* This is the package version */
-#undef VERSION
 
 /* The number of bytes in a double.  */
 #undef SIZEOF_DOUBLE
@@ -62,12 +63,15 @@
 /* The number of bytes in a short.  */
 #undef SIZEOF_SHORT
 
+/* The number of bytes in a void *.  */
+#undef SIZEOF_VOID_P
+
 /* Define if you have the memcpy function.  */
 #undef HAVE_MEMCPY
 
-/* Define if target machine is big endian. */
+/* Name of package */
-#undef WORDS_BIGENDIAN
+#undef PACKAGE
 
-/* The number of bytes in a void pointer.  */
+/* Version number of package */
-#undef SIZEOF_VOID_P
+#undef VERSION
 

libffi/include/ffi.h.in

@@ -1,7 +1,7 @@
 /* -----------------------------------------------------------------*-C-*-
    libffi @VERSION@ - Copyright (c) 1996-1999  Cygnus Solutions
 
-   $Id: ffi.h.in,v 1.2 1999/08/04 18:00:05 green Exp $
+   $Id: ffi.h.in,v 1.3 1999/08/08 13:05:12 green Exp $
 
    Permission is hereby granted, free of charge, to any person obtaining
    a copy of this software and associated documentation files (the
@@ -32,8 +32,27 @@
 
 /* ---- System configuration information --------------------------------- */
 
+#ifdef PACKAGE
+#define OLD_PACKAGE PACKAGE
+#undef PACKAGE
+#endif
+#ifdef VERSION
+#define OLD_VERSION VERSION
+#undef VERSION
+#endif
+
 #include <fficonfig.h>
 
+#undef PACKAGE
+#undef VERSION
+
+#ifdef OLD_PACKAGE
+#define PACKAGE OLD_PACKAGE
+#endif
+#ifdef OLD_VERSION
+#define VERSION OLD_VERSION
+#endif
+
 #if !defined(LIBFFI_ASM)
 #include <stddef.h>
 #if defined(FFI_DEBUG) 

libffi/src/x86/ffi.c

@@ -3,7 +3,7 @@
    
    x86 Foreign Function Interface 
 
-   $Id: ffi.c,v 1.2 1999/08/04 18:00:05 green Exp $
+   $Id: ffi.c,v 1.3 1999/08/08 13:05:12 green Exp $
 
    Permission is hereby granted, free of charge, to any person obtaining
    a copy of this software and associated documentation files (the
@@ -468,12 +468,13 @@ ffi_call_SYSV(void (*)(char *, extended_cif *),
 	      void (*fn)());
 
 void
-ffi_call_raw(/*@dependent@*/ ffi_cif *cif, 
+ffi_raw_call(/*@dependent@*/ ffi_cif *cif, 
 	     void (*fn)(), 
 	     /*@out@*/ void *rvalue, 
-	     /*@dependent@*/ void **avalue)
+	     /*@dependent@*/ ffi_raw *fake_avalue)
 {
   extended_cif ecif;
+  void **avalue = (void **)fake_avalue;
 
   ecif.cif = cif;
   ecif.avalue = avalue;