ref: a1a5414ed17ae07d53d8e908267e9539a838d22f
parent: 40d35cd1593d7da63ddfef94dad1ca3fcd68ff12
parent: 645ac9298c8d9c7ffee3da6c849a389bcc9adcb2
author: Ori Bernstein <[email protected]>
date: Thu Dec 12 15:47:58 EST 2013
Merge branch 'master' of git+ssh://git.eigenstate.org/git/ori/mc
--- a/libstd/strsplit.myr
+++ b/libstd/strsplit.myr
@@ -24,6 +24,7 @@
last = i + 1
;;
;;
+ sp = slpush(sp, s[last:i])
-> sp
}
--- a/libstd/sys-linux.myr
+++ b/libstd/sys-linux.myr
@@ -66,7 +66,7 @@
type sockaddr_in = struct
fam : sockfam
port : uint16
- addr : uint32
+ addr : byte[4]
zero : byte[8]
;;
@@ -500,16 +500,16 @@
const clockid = {clk
match clk
- `Clockrealtime: -> 0;;
- `Clockmonotonic: -> 1;;
- `Clockproccpu: -> 2;;
- `Clockthreadcpu: -> 3;;
- `Clockmonotonicraw: -> 4;;
- `Clockrealtimecoarse: -> 5;;
- `Clockmonotoniccoarse: -> 6;;
- `Clockboottime: -> 7;;
- `Clockrealtimealarm: -> 8;;
- `Clockboottimealarm: -> 9;;
+ | `Clockrealtime: -> 0
+ | `Clockmonotonic: -> 1
+ | `Clockproccpu: -> 2
+ | `Clockthreadcpu: -> 3
+ | `Clockmonotonicraw: -> 4
+ | `Clockrealtimecoarse: -> 5
+ | `Clockmonotoniccoarse:-> 6
+ | `Clockboottime: -> 7
+ | `Clockrealtimealarm: -> 8
+ | `Clockboottimealarm: -> 9
;;
-> -1
}