Merge branch 'master' into for-steve

[sxemacs] / src / effi.c

diff --git a/src/effi.c b/src/effi.c
index 930d380..06bf61b 100644 (file)
--- a/src/effi.c
+++ b/src/effi.c
@@ -1666,6 +1666,8 @@ Return DEVICE display as FFI object.
 /* Callbacks */
 #define FFI_CC_CDECL 0
 
+void* ffi_make_callback_x86(Lisp_Object data, int cc_type);
+
 #if defined __i386__
 static void
 ffi_callback_call_x86(Lisp_Object cbk_info, char *arg_buffer)
@@ -1817,6 +1819,13 @@ Create dynamic callback and return pointer to it.
        ptr = Fmake_ffi_object(Qpointer, Qnil);
 #ifdef __i386__
        XEFFIO(ptr)->fop.ptr = ffi_make_callback_x86(data, XINT(cctype));
+#else
+#ifdef SXEMACS
+        error("FFI Callbacks not supported on this configuration");
+#else
+        signal_ferror(Qinternal_error,
+                      "FFI Callbacks not supported on this configuration");
+#endif /* SXEMACS */
 #endif /* __i386__ */
        return ptr;
 }