mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2024-12-01 04:19:55 +00:00
Code Issues 1 Releases Wiki Activity

Fix bad merge.

Browse Source
This commit is contained in:
Calvin Rose 2019-12-04 22:41:30 -06:00
parent 1a4035b02c
commit dbcceefc20
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/boot/boot.janet
View File

@ -1850,8 +1850,6 @@
(res) (res)
(error (res :error)))) (error (res :error))))
<<<<<<< HEAD
(def make-image-dict (def make-image-dict
"A table used in combination with marshal to marshal code (images), such that "A table used in combination with marshal to marshal code (images), such that
(make-image x) is the same as (marshal x make-image-dict)." (make-image x) is the same as (marshal x make-image-dict)."

2
src/core/thread.c
View File

@ -355,7 +355,7 @@ static Janet cfun_thread_receive(int32_t argc, Janet *argv) {
const Janet *items; const Janet *items;
if (janet_indexed_view(argv[0], &items, &count)) { if (janet_indexed_view(argv[0], &items, &count)) {
if (count == 0) { if (count == 0) {
janet_panics("expected at least 1 thread"); janet_panic("expected at least 1 thread");
} }
if (count == 1) { if (count == 1) {
JanetThread *thread = janet_getthread(items, 0); JanetThread *thread = janet_getthread(items, 0);