Commit 0c5fe3f4 authored by Mart Lubbers's avatar Mart Lubbers

make System.Time up to date

parent 96b15436
Pipeline #8852 passed with stage
in 1 minute and 28 seconds
implementation module System.Time
import StdString, StdArray, StdClass, StdOverloaded, StdInt
import System._Pointer, System.OS
import StdString, StdArray, StdClass, StdOverloaded, StdInt, StdMisc
import System.OS
import System._Pointer, System._Posix
import Text
......@@ -166,10 +166,7 @@ unpackTm buf off =
}
sizeOfTm :: Int
<<<<<<< HEAD
sizeOfTm = IF_ANDROID 44 36
=======
sizeOfTm = 36
nsTime :: !*World -> (!Timespec, !*World)
nsTime w
......@@ -180,4 +177,3 @@ nsTime w
# (tv_sec, p) = readIntP p 0
# (tv_nsec, p) = readIntP p 8
= ({Timespec | tv_sec = tv_sec, tv_nsec = tv_nsec}, freeSt p w)
>>>>>>> 77b02c8b9aa43e18ae3cbce41eecfb3b7ee03b3c
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment