--- gforth/engine/engine.c	2003/10/09 20:25:59	1.69
+++ gforth/engine/engine.c	2003/11/02 18:18:35	1.71
@@ -185,12 +185,16 @@ extern int gforth_memcmp(const char * s1
 #define SUPER_CONTINUE
 
 #ifdef GFORTH_DEBUGGING
+#if DEBUG
+#define NAME(string) { saved_ip=ip; asm(""); fprintf(stderr,"%08lx depth=%3ld: "string"\n",(Cell)ip,sp0+3-sp);}
+#else /* !DEBUG */
 #define NAME(string) { saved_ip=ip; asm(""); }
 /* the asm here is to avoid reordering of following stuff above the
    assignment; this is an old-style asm (no operands), and therefore
    is treated like "asm volatile ..."; i.e., it prevents most
    reorderings across itself.  We want the assignment above first,
    because the stack loads may already cause a stack underflow. */
+#endif /* !DEBUG */
 #elif DEBUG
 #       define  NAME(string)    fprintf(stderr,"%08lx depth=%3ld: "string"\n",(Cell)ip,sp0+3-sp);
 #else
@@ -286,14 +290,14 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
 #define MAX_SYMBOLS (sizeof(symbols)/sizeof(symbols[0]))
 #endif /* !defined(DOUBLY_INDIRECT) */
 #define INST_ADDR(name) ((Label)&&I_##name)
-#include "prim_lab.i"
+#include PRIM_LAB_I
 #undef INST_ADDR
     (Label)0,
 #define INST_ADDR(name) ((Label)&&K_##name)
-#include "prim_lab.i"
+#include PRIM_LAB_I
 #undef INST_ADDR
 #define INST_ADDR(name) ((Label)&&J_##name)
-#include "prim_lab.i"
+#include PRIM_LAB_I
 #undef INST_ADDR
     (Label)&&after_last
   };
@@ -346,7 +350,7 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
   CPU_DEP3
 #endif
 
-#include "prim.i"
+#include PRIM_I
   after_last: return (Label *)0;
   /*needed only to get the length of the last primitive */
 }