--- gforth/prim	2011/12/02 21:59:09	1.261
+++ gforth/prim	2011/12/19 19:43:29	1.263
@@ -1103,6 +1103,22 @@ lshift	( u1 n -- u2 )		core	l_shift
 :
     0 ?DO 2* LOOP ;
 
+umax	( u1 u2 -- u )	core
+if (u1<u2)
+  u = u2;
+else
+  u = u1;
+:
+ 2dup u< IF swap THEN drop ;
+
+umin	( u1 u2 -- u )	core
+if (u1<u2)
+  u = u1;
+else
+  u = u2;
+:
+ 2dup u> IF swap THEN drop ;
+
 \g compare
 
 \ comparisons(prefix, args, prefix, arg1, arg2, wordsets...)
@@ -2035,15 +2051,16 @@ dsystem = DZERO;
 
 ntime	( -- dtime )	gforth
 ""Report the current time in nanoseconds since some epoch.""
-#ifdef HAVE_CLOCK_GETTIME
 struct timespec time1;
+#ifdef HAVE_CLOCK_GETTIME
 clock_gettime(CLOCK_REALTIME,&time1);
-dtime = timespec2ns(&time1);
 #else
-struct timeval time1;
-gettimeofday(&time1,NULL);
-dtime = timeval2us(&time1) * 1000LL;
+struct timeval time2;
+gettimeofday(&time2,NULL);
+time1.tv_sec = time2.tv_sec;
+time1.tv_nsec = time2.tv_usec*1000;
 #endif
+dtime = timespec2ns(&time1);
 
 \+