Skip to content

Fix a couple of build errors #2103

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

Merged
merged 3 commits into from
Nov 29, 2023
Merged

Fix a couple of build errors #2103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d79a41c
Fix conflict between async exns and compactor patches
mshinwell Nov 29, 2023
8764865
Silence warning about sync_check_error
mshinwell Nov 29, 2023
155489c
Use Caml_inline
mshinwell Nov 29, 2023
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: 1 addition & 1 deletion ocaml/runtime/gc_ctrl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ CAMLprim value caml_gc_compaction(value v)
value exn = gc_major_exn(1);
++ Caml_state->stat_forced_major_collections;
CAML_EV_END(EV_EXPLICIT_GC_COMPACT);
return caml_raise_if_exception(exn);
return caml_raise_async_if_exception(exn, "");
}

CAMLprim value caml_gc_stat(value v)
Expand Down
4 changes: 2 additions & 2 deletions ocaml/runtime/sync_posix.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ Caml_inline int sync_mutex_unlock(sync_mutex m)

/* If we're using glibc, use a custom condition variable implementation to
avoid this bug: https://sourceware.org/bugzilla/show_bug.cgi?id=25847

For now we only have this on linux because it directly uses the linux futex
syscalls. */
#if defined(__linux__) && defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__)
Expand Down Expand Up @@ -206,7 +206,7 @@ Caml_inline int sync_condvar_wait(sync_condvar c, sync_mutex m)

/* Reporting errors */

static void sync_check_error(int retcode, char * msg)
Caml_inline void sync_check_error(int retcode, char * msg)
{
char * err;
char buf[1024];
Expand Down