--- gforth/engine/engine.c	2008/07/03 12:29:05	1.108
+++ gforth/engine/engine.c	2010/10/10 14:09:34	1.112
@@ -1,6 +1,6 @@
 /* Gforth virtual machine (aka inner interpreter)
 
-  Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007 Free Software Foundation, Inc.
+  Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc.
 
   This file is part of Gforth.
 
@@ -44,7 +44,9 @@
 #include <unistd.h>
 #include <pwd.h>
 #include <dirent.h>
+#ifdef HAVE_WCHAR_H
 #include <wchar.h>
+#endif
 #include <sys/resource.h>
 #ifdef HAVE_FNMATCH_H
 #include <fnmatch.h>
@@ -347,9 +349,9 @@ Label *gforth_engine(Xt *ip0, Cell *sp0,
   register Cell MAYBE_UNUSED spc spcREG;
   register Cell MAYBE_UNUSED spd spdREG;
   register Cell MAYBE_UNUSED spe speREG;
-  register Cell MAYBE_UNUSED spf speREG;
-  register Cell MAYBE_UNUSED spg speREG;
-  register Cell MAYBE_UNUSED sph speREG;
+  register Cell MAYBE_UNUSED spf spfREG;
+  register Cell MAYBE_UNUSED spg spgREG;
+  register Cell MAYBE_UNUSED sph sphREG;
   IF_fpTOS(register Float fpTOS FTOSREG;)
 #endif /* !defined(GFORTH_DEBUGGING) */
 #if defined(DOUBLY_INDIRECT)
@@ -404,7 +406,7 @@ Label *gforth_engine(Xt *ip0, Cell *sp0,
 
     symbols = (Label *)(malloc(MAX_SYMBOLS*sizeof(Cell)+CODE_OFFSET)+code_offset);
     xts = (Label *)(malloc(MAX_SYMBOLS*sizeof(Cell)+XT_OFFSET)+xt_offset);
-    for (i=0; i<DOESJUMP+1; i++)
+    for (i=0; i<DOER_MAX+1; i++)
       xts[i] = symbols[i] = (Label)routines[i];
     for (; routines[i]!=0; i++) {
       if (i>=MAX_SYMBOLS) {