summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adam@chlipala.net>2015-11-01 11:55:01 -0500
committerGravatar Adam Chlipala <adam@chlipala.net>2015-11-01 11:55:01 -0500
commit3cf49898acbf6701b04a1de4938241f1009c5e5a (patch)
tree029b7822e16333e345fa5948fb57c9eb8846afa7 /src
parent0746eb28c54cb2ba778150e9fd8d0c399f7dcd14 (diff)
Basis.fromMilliseconds
Diffstat (limited to 'src')
-rw-r--r--src/c/urweb.c5
-rw-r--r--src/settings.sml1
2 files changed, 6 insertions, 0 deletions
diff --git a/src/c/urweb.c b/src/c/urweb.c
index 1ef6600c..169152dc 100644
--- a/src/c/urweb.c
+++ b/src/c/urweb.c
@@ -4060,6 +4060,11 @@ uw_Basis_int uw_Basis_toMilliseconds(uw_context ctx, uw_Basis_time tm) {
return tm.seconds * 1000 + tm.microseconds / 1000;
}
+uw_Basis_time uw_Basis_fromMilliseconds(uw_context ctx, uw_Basis_int n) {
+ uw_Basis_time tm = {n / 1000, n % 1000 * 1000};
+ return tm;
+}
+
uw_Basis_int uw_Basis_diffInMilliseconds(uw_context ctx, uw_Basis_time tm1, uw_Basis_time tm2) {
return uw_Basis_toMilliseconds(ctx, tm2) - uw_Basis_toMilliseconds(ctx, tm1);
}
diff --git a/src/settings.sml b/src/settings.sml
index bea26103..0140ddc0 100644
--- a/src/settings.sml
+++ b/src/settings.sml
@@ -342,6 +342,7 @@ val jsFuncsBase = basisM [("alert", "alert"),
("addSeconds", "addSeconds"),
("diffInSeconds", "diffInSeconds"),
("toMilliseconds", "toMilliseconds"),
+ ("fromMilliseconds", "fromMilliseconds"),
("diffInMilliseconds", "diffInMilliseconds"),
("fromDatetime", "fromDatetime"),