--- gforth/engine/engine.c	2000/06/14 20:31:47	1.18
+++ gforth/engine/engine.c	2000/08/08 12:37:05	1.21
@@ -39,8 +39,13 @@
 #include <unistd.h>
 #include <pwd.h>
 #include <dirent.h>
+#include <sys/resource.h>
+#ifdef HAVE_FNMATCH_H
 #include <fnmatch.h>
 #else
+#include "fnmatch.h"
+#endif
+#else
 #include "systypes.h"
 #endif
 
@@ -165,6 +170,19 @@ char *tilde_cstr(Char *from, UCell size,
 }
 #endif
 
+DCell timeval2us(struct timeval *tvp)
+{
+#ifndef BUGGY_LONG_LONG
+  return (tvp->tv_sec*(DCell)1000000)+tvp->tv_usec;
+#else
+  DCell d2;
+  DCell d1=mmul(tvp->tv_sec,1000000);
+  d2.lo = d1.lo+tvp->tv_usec;
+  d2.hi = d1.hi + (d2.lo<d1.lo);
+  return d2;
+#endif
+}
+
 #define NEWLINE	'\n'
 
 #ifndef HAVE_RINT
@@ -302,12 +320,12 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
       if (i>=MAX_SYMBOLS) {
 	fprintf(stderr,"gforth-ditc: more than %d primitives\n",MAX_SYMBOLS);
 	exit(1);
+      }
+      symbols[i] = &routines[i];
     }
-    symbols[i] = &routines[i];
-  }
 #endif /* defined(DOUBLY_INDIRECT) */
-  return symbols;
-}
+    return symbols;
+  }
 
   IF_TOS(TOS = sp[0]);
   IF_FTOS(FTOS = fp[0]);