--- gforth/engine/engine.c	2005/12/31 15:46:13	1.87
+++ gforth/engine/engine.c	2006/03/11 23:05:09	1.90
@@ -46,6 +46,7 @@
 #include <unistd.h>
 #include <pwd.h>
 #include <dirent.h>
+#include <wchar.h>
 #include <sys/resource.h>
 #ifdef HAVE_FNMATCH_H
 #include <fnmatch.h>
@@ -242,8 +243,8 @@ extern int gforth_memcmp(const char * s1
 #endif
 
 #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]);
+#define SAVE_REGS IF_fpTOS(fp[0]=fpTOS); gforth_SP=sp; gforth_FP=fp; gforth_RP=rp; gforth_LP=lp;
+#define REST_REGS sp=gforth_SP; fp=gforth_FP; rp=gforth_RP; lp=gforth_LP; IF_fpTOS(fpTOS=fp[0]);
 #endif
 
 #if !defined(ENGINE)
@@ -255,7 +256,7 @@ extern int gforth_memcmp(const char * s1
 #elif ENGINE==2
 /* variant with padding between VM instructions for finding out
    cross-inst jumps (for dynamic code) */
-#define engine engine2
+#define gforth_engine gforth_engine2
 #define VARIANT(v)	(v)
 #define JUMP(target)	goto I_noop
 #define LABEL(name) H_##name: SKIP16; I_##name:
@@ -263,7 +264,7 @@ extern int gforth_memcmp(const char * s1
 #elif ENGINE==3
 /* variant with different immediate arguments for finding out
    immediate arguments (for native code) */
-#define engine engine3
+#define gforth_engine gforth_engine3
 #define VARIANT(v)	((v)^0xffffffff)
 #define JUMP(target)	goto K_lit
 #define LABEL(name) H_##name: asm(""); I_##name:
@@ -275,7 +276,7 @@ extern int gforth_memcmp(const char * s1
 #define LABEL2(name) K_##name: asm("");
 #define LABEL3(name) J_##name: asm("");
 
-Label *engine(Xt *ip0, Cell *sp0, Cell *rp0, Float *fp0, Address lp0)
+Label *gforth_engine(Xt *ip0, Cell *sp0, Cell *rp0, Float *fp0, Address lp0)
 /* executes code at ip, if ip!=NULL
    returns array of machine code labels (for use in a loader), if ip==NULL
 */
@@ -296,7 +297,7 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
 #endif
 #ifdef HAS_FFCALL
   av_alist alist;
-  extern va_alist clist;
+  extern va_alist gforth_clist;
   float frv;
   int irv;
   double drv;
@@ -304,11 +305,11 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
   void * prv;
 #endif
 #ifdef HAS_LIBFFI
-  extern void * ritem;
-  extern void ** clist;
+  extern void * gforth_ritem;
+  extern void ** gforth_clist;
   extern void ffi_callback(ffi_cif * cif, void * resp, void ** args, Xt * ip);
 #endif
-  register Address up UPREG = UP;
+  register Address up UPREG = gforth_UP;
   register Cell MAYBE_UNUSED spTOS TOSREG;
   register Cell MAYBE_UNUSED spb spbREG;
   register Cell MAYBE_UNUSED spc spcREG;