Skip to content

Commit d183a5c

Browse files
committed
Resolve sigprocmask cr
1 parent eeda5a0 commit d183a5c

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

ocaml/otherlibs/unix/signals.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,7 @@ CAMLprim value caml_unix_sigprocmask(value vaction, value vset)
7575
decode_sigset(vset, &set);
7676
caml_enter_blocking_section();
7777
#ifdef CAML_RUNTIME_5
78-
// CR ocaml 5 runtime: the upstream 5.0 unix lib uses sigprocmask here,
79-
// which seems wrong? Previously, there was a global caml_sigmask_hook wrapper
80-
// that got installed as sigprocmask or pthread_sigmask based on whether
81-
// systhreads was enabled. The 5 runtime is now multithreaded, so always
82-
// links pthread, so should always use pthread_sigmask.
78+
// Differs from upstream: https://github.com/ocaml/ocaml/pull/12743
8379
retcode = pthread_sigmask(how, &set, &oldset);
8480
#else
8581
retcode = caml_sigmask_hook(how, &set, &oldset);

0 commit comments

Comments
 (0)