Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.6] Backport #6517 (MSVC fix) #6557

Merged
merged 1 commit into from
Nov 24, 2022
Merged

[3.6] Backport #6517 (MSVC fix) #6557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

- Fix status line enabled when ANSI colors are forced. (#6503, @MisterDA)

- Fix build with MSVC compiler (#6517, @nojb)

3.6.0 (2022-11-14)
------------------

Expand Down
2 changes: 2 additions & 0 deletions src/dune_util/dune_flock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
CAMLprim value dune_flock_lock(value v_fd, value v_block, value v_exclusive) {
#ifdef _WIN32
caml_failwith("no flock on win32");
return Val_unit;
#else
CAMLparam2(v_fd, v_block);
int flags = 0;
Expand All @@ -35,6 +36,7 @@ CAMLprim value dune_flock_lock(value v_fd, value v_block, value v_exclusive) {
CAMLprim value dune_flock_unlock(value v_fd) {
#ifdef _WIN32
caml_failwith("no flock on win32");
return Val_unit;
#else
CAMLparam1(v_fd);
caml_release_runtime_system();
Expand Down