[commit] r2096 - include ffi.h unless HAVE_FFI_FFI_H is defined

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[commit] r2096 - include ffi.h unless HAVE_FFI_FFI_H is defined

commits-3
 
Author: piumarta
Date: 2009-08-26 12:21:15 -0700 (Wed, 26 Aug 2009)
New Revision: 2096

Modified:
   trunk/platforms/unix/ChangeLog
   trunk/platforms/unix/plugins/SqueakFFIPrims/any-libffi.c
Log:
include ffi.h unless HAVE_FFI_FFI_H is defined

Modified: trunk/platforms/unix/ChangeLog
===================================================================
--- trunk/platforms/unix/ChangeLog 2009-08-26 19:17:25 UTC (rev 2095)
+++ trunk/platforms/unix/ChangeLog 2009-08-26 19:21:15 UTC (rev 2096)
@@ -1,5 +1,8 @@
 2009-08-26    <[hidden email]>
 
+ * plugins/SqueakFFIPrims/any-libffi.c: Include ffi.h unless
+ HAVE_FFI_FFI_H is defined.
+
  * plugins/RomePlugin/config.cmake, plugins/UUIDPlugin/config.cmake,
  plugins/SqueakFFIPrims/config.cmake, plugins/OggPlugin/config.cmake,
  plugins/UnixOSProcessPlugin/config.cmake,

Modified: trunk/platforms/unix/plugins/SqueakFFIPrims/any-libffi.c
===================================================================
--- trunk/platforms/unix/plugins/SqueakFFIPrims/any-libffi.c 2009-08-26 19:17:25 UTC (rev 2095)
+++ trunk/platforms/unix/plugins/SqueakFFIPrims/any-libffi.c 2009-08-26 19:21:15 UTC (rev 2096)
@@ -17,10 +17,10 @@
 
 #ifndef NO_FFI_SUPPORT
 
-#if defined(HAVE_FFI_H)
+#if defined(HAVE_FFI_FFI_H)
+# include <ffi/ffi.h>
+#else
 # include <ffi.h>
-#elif defined(HAVE_FFI_FFI_H)
-# include <ffi/ffi.h>
 #endif
 
 #ifndef  FFI_TYPE_STRUCT /* this is private in libffi-2 */