last using patch, i think i got it

diff --git a/basis/calendar/unix/unix.factor b/basis/calendar/unix/unix.factor
index fcdfcc8a676e25d2a657bd78147635a9cb5e3bfd..d5b66ffc1ad52059b74a17e2e35b2bb2bc433a51 100644 (file)
--- a/basis/calendar/unix/unix.factor
+++ b/basis/calendar/unix/unix.factor
@@ -4,18 +4,6 @@ USING: alien alien.c-types alien.syntax arrays calendar
 kernel math unix unix.time namespaces system ;
 IN: calendar.unix
 
-: make-timeval ( ms -- timeval )
-    1000 /mod 1000 *
-    "timeval" <c-object>
-    [ set-timeval-usec ] keep
-    [ set-timeval-sec ] keep ;
-
-: make-timespec ( ms -- timespec )
-    1000 /mod 1000000 *
-    "timespec" <c-object>
-    [ set-timespec-nsec ] keep
-    [ set-timespec-sec ] keep ;
-
 : timeval>unix-time ( timeval -- timestamp )
     [ timeval-sec seconds ] [ timeval-usec microseconds ] bi
     time+ since-1970 ;

diff --git a/basis/unix/time/time.factor b/basis/unix/time/time.factor
index b6471e9892ecfddf6b2e1378a4216e9892e6a578..c664aa3bfbb94a2a2c0b3bbc412832298ab7e11e 100644 (file)
--- a/basis/unix/time/time.factor
+++ b/basis/unix/time/time.factor
@@ -11,6 +11,18 @@ C-STRUCT: timespec
     { "time_t" "sec" }
     { "long" "nsec" } ;
 
+: make-timeval ( ms -- timeval )
+    1000 /mod 1000 *
+    "timeval" <c-object>
+    [ set-timeval-usec ] keep
+    [ set-timeval-sec ] keep ;
+
+: make-timespec ( ms -- timespec )
+    1000 /mod 1000000 *
+    "timespec" <c-object>
+    [ set-timespec-nsec ] keep
+    [ set-timespec-sec ] keep ;
+
 C-STRUCT: tm
     { "int" "sec" }    ! Seconds: 0-59 (K&R says 0-61?)
     { "int" "min" }    ! Minutes: 0-59