diff options
| author |  Calvin Rose <calsrose@gmail.com> | 2021-09-18 13:40:32 -0500 |
|---|---|---|
| committer | Calvin Rose <calsrose@gmail.com> | 2021-09-18 13:40:32 -0500 |
| commit | 8b10a5fb7c18308d48cbb773232f7429ce35ba5a (patch) | |
| tree | 7fdbb9d462347543e701ca177945390c6c6bb770 | |
| parent | Address #809 - treat first docstring line different from others. (diff) | |
Format and update CHANGELOG.md
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | src/core/ev.c | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index cf7adffc..5ebc13b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ All notable changes to this project will be documented in this file. ## Unlreleased - ??? +- Remove include of windows.h from janet.h. This caused issues on certain projects. - Fix formatting in doc-format to better handle special characters in signatures. - Fix some marshalling bugs. - Add optional Makefile target to install jpm as well. diff --git a/src/core/ev.c b/src/core/ev.c index 63b1fdb6..967dcc25 100644 --- a/src/core/ev.c +++ b/src/core/ev.c @@ -1689,11 +1689,11 @@ void janet_loop1_impl(int has_timeout, JanetTimestamp timeout) { struct kevent timer; if (janet_vm.timer_enabled || has_timeout) { EV_SETx(&timer, - JANET_KQUEUE_TIMER_IDENT, - EVFILT_TIMER, - JANET_KQUEUE_TF, - NOTE_MSECONDS | NOTE_ABSTIME, - JANET_KQUEUE_TS(timeout), &janet_vm.timer); + JANET_KQUEUE_TIMER_IDENT, + EVFILT_TIMER, + JANET_KQUEUE_TF, + NOTE_MSECONDS | NOTE_ABSTIME, + JANET_KQUEUE_TS(timeout), &janet_vm.timer); add_kqueue_events(&timer, 1); } janet_vm.timer_enabled = has_timeout; @@ -1709,7 +1709,7 @@ void janet_loop1_impl(int has_timeout, JanetTimestamp timeout) { /* Step state machines */ for (int i = 0; i < status; i++) { - void *p = (void*) events[i].udata; + void *p = (void *) events[i].udata; if (&janet_vm.timer == p) { /* Timer expired, ignore */; } else if (janet_vm.selfpipe == p) { |