diff options
| author | Rickard Green <[email protected]> | 2016-08-30 15:55:06 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-08-30 15:55:06 +0200 |
| commit | 388bde3cce52302bd8773dd80fecf4f9f25f9568 (patch) | |
| tree | bcbd19794e229b9e5d83b22bde9ad038aaa1c3c3 /erts/emulator/beam/erl_process.c | |
| parent | a786167f801993995f2a1c6a5368a519cb341800 (diff) | |
| parent | 037bde5b479c18711a32713751f9ae79b29a8741 (diff) | |
| download | otp-388bde3cce52302bd8773dd80fecf4f9f25f9568.tar.gz otp-388bde3cce52302bd8773dd80fecf4f9f25f9568.tar.bz2 otp-388bde3cce52302bd8773dd80fecf4f9f25f9568.zip | |
Merge branch 'maint'
* maint:
Fix dirty schedulers build on windows
Diffstat (limited to 'erts/emulator/beam/erl_process.c')
| -rw-r--r-- | erts/emulator/beam/erl_process.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index fa8290028a..bcbb9b3115 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) { |