--- gforth/engine/engine.c	1998/12/08 22:03:02	1.6
+++ gforth/engine/engine.c	1998/12/12 22:32:05	1.8
@@ -45,6 +45,9 @@
 #if defined(HAVE_LIBDL) || defined(HAVE_DLOPEN) /* what else? */
 #include <dlfcn.h>
 #endif
+#if defined(_WIN32)
+#include <windows.h>
+#endif
 #ifdef hpux
 #include <dl.h>
 #endif
@@ -250,7 +253,7 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
     (Label)&&dodoes,
     /* the following entry is normally unused;
        it's there because its index indicates a does-handler */
-    (Label)CPU_DEP1,
+    CPU_DEP1,
 #include "prim_lab.i"
     (Label)0
   };
@@ -270,24 +273,24 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
 #define CODE_OFFSET (22*sizeof(Cell))
     int i;
     Cell code_offset = offset_image? CODE_OFFSET : 0;
-    
+
     symbols = (Label *)(malloc(MAX_SYMBOLS*sizeof(Cell)+CODE_OFFSET)+code_offset);
     for (i=0; i<DOESJUMP+1; i++)
-    symbols[i] = routines[i];
+      symbols[i] = (Label)routines[i];
     for (; routines[i]!=0; i++) {
       if (i>=MAX_SYMBOLS) {
 	fprintf(stderr,"gforth-ditc: more than %d primitives\n",MAX_SYMBOLS);
 	exit(1);
-      }
-      symbols[i] = &routines[i];
     }
-#endif /* defined(DOUBLY_INDIRECT) */
-    return symbols;
+    symbols[i] = &routines[i];
   }
+#endif /* defined(DOUBLY_INDIRECT) */
+  return symbols;
+}
 
   IF_TOS(TOS = sp[0]);
   IF_FTOS(FTOS = fp[0]);
-  /*  prep_terminal(); */
+/*  prep_terminal(); */
   NEXT_P0;
   NEXT;