--- gforth/engine/engine.c	2006/01/05 01:37:32	1.88
+++ gforth/engine/engine.c	2006/10/21 22:13:49	1.91
@@ -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>
@@ -96,6 +97,8 @@ extern int gforth_memcmp(const char * s1
 #endif
 
 #define NEWLINE	'\n'
+#define CELL_MIN (((Cell)1)<<(sizeof(Cell)*CHAR_BIT-1))
+#define CHECK_DIVISION 1
 
 /* conversion on fetch */
 
@@ -255,7 +258,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 +266,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 +278,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 +299,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,8 +307,8 @@ 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 = gforth_UP;