aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_process.c
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2016-08-30 15:53:45 +0200
committerRickard Green <[email protected]>2016-08-30 15:53:45 +0200
commit037bde5b479c18711a32713751f9ae79b29a8741 (patch)
tree23fc7a0e3fadf74333a1db1128367194f6e15488 /erts/emulator/beam/erl_process.c
parent16f4bd5f6cb5fe6d6412ae219634902813bd9cce (diff)
parent2c8a13e5d3aabeedeb290624d6acc02d25db1bd5 (diff)
downloadotp-037bde5b479c18711a32713751f9ae79b29a8741.tar.gz
otp-037bde5b479c18711a32713751f9ae79b29a8741.tar.bz2
otp-037bde5b479c18711a32713751f9ae79b29a8741.zip
Merge branch 'rickard/ds-win-32bit/OTP-13759' into maint
* rickard/ds-win-32bit/OTP-13759: Fix dirty schedulers build on windows
Diffstat (limited to 'erts/emulator/beam/erl_process.c')
-rw-r--r--erts/emulator/beam/erl_process.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index c2735b17e1..bc59147c6c 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -9408,6 +9408,14 @@ erts_set_process_priority(Process *p, Eterm value)
}
}
+#ifdef __WIN32__
+Sint64
+erts_time2reds(ErtsMonotonicTime start, ErtsMonotonicTime end)
+{
+ return ERTS_TIME2REDS_IMPL__(start, end);
+}
+#endif
+
static int
scheduler_gc_proc(Process *c_p, int reds_left)
{