Fix MSVC build (#6517) (#6557)

Signed-off-by: Nicolás Ojeda Bär <n.oje.bar@gmail.com> Signed-off-by: Nicolás Ojeda Bär <n.oje.bar@gmail.com>
ocaml · Nov 24, 2022 · f8cfe22 · f8cfe22
1 parent a133f52
commit f8cfe22
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -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)
 ------------------
 

diff --git a/src/dune_util/dune_flock.c b/src/dune_util/dune_flock.c
@@ -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;
@@ -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();
-Original file 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)
 .6.0 (2022-11-14)
     ------------------
@@ Expand Down @@