Skip to content

Commit

Permalink
Fix MSVC build (#6517)
Browse files Browse the repository at this point in the history
Signed-off-by: Nicolás Ojeda Bär <[email protected]>
  • Loading branch information
nojb authored Nov 19, 2022
1 parent 4e112a0 commit d81b168
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ Unreleased
- Allow `$ dune ocaml dump-dot-merlin` to run in watch mode. Also this command
shouldn't print "Entering Directory" mesages. (#6497, @rgrinberg)

- 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
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

0 comments on commit d81b168

Please sign in to comment.