--- gforth/engine/engine.c	2005/08/21 22:09:14	1.84
+++ gforth/engine/engine.c	2005/12/27 09:35:45	1.86
@@ -241,7 +241,7 @@ extern int gforth_memcmp(const char * s1
       }
 #endif
 
-#ifdef HAS_FFCALL
+#if defined(HAS_FFCALL) || defined(HAS_LIBFFI)
 #define SAVE_REGS IF_fpTOS(fp[0]=fpTOS); SP=sp; FP=fp; RP=rp; LP=lp;
 #define REST_REGS sp=SP; fp=FP; rp=RP; lp=LP; IF_fpTOS(fpTOS=fp[0]);
 #endif
@@ -259,7 +259,6 @@ extern int gforth_memcmp(const char * s1
 #define VARIANT(v)	(v)
 #define JUMP(target)	goto I_noop
 #define LABEL(name) H_##name: SKIP16; I_##name:
-#define IN_ENGINE2
 
 #elif ENGINE==3
 /* variant with different immediate arguments for finding out