mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-30 17:00:23 +02:00
Code Activity

Merge remote-tracking branch 'origin/stable-2.2'

Browse source
This commit is contained in:
Andy Wingo 2019-12-11 21:26:54 +01:00
commit bcb4f7dca8
2 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

31
libguile/finalizers.c
View file

@ -1,4 +1,4 @@
/* Copyright 2012-2014,2018 /* Copyright 2012-2014,2018-2019
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of Guile. This file is part of Guile.
@ -217,21 +217,26 @@ finalization_thread_proc (void *unused)
scm_without_guile (read_finalization_pipe_data, &data); scm_without_guile (read_finalization_pipe_data, &data);
if (data.n <= 0 && data.err != EINTR) if (data.n <= 0)
{ {
perror ("error in finalization thread"); if (data.err != EINTR)
return NULL; {
perror ("error in finalization thread");
return NULL;
}
} }
else
switch (data.byte)
{ {
case 0: switch (data.byte)
scm_run_finalizers (); {
break; case 0:
case 1: scm_run_finalizers ();
return NULL; break;
default: case 1:
abort (); return NULL;
default:
abort ();
}
} }
} }
} }

2
libguile/ports.c
View file

@ -1447,7 +1447,7 @@ SCM_DEFINE (scm_port_poll, "port-poll", 2, 1, 0,
if (scm_i_string_contains_char (events, '!')) if (scm_i_string_contains_char (events, '!'))
c_events |= POLLPRI; c_events |= POLLPRI;
if (scm_i_string_contains_char (events, 'w')) if (scm_i_string_contains_char (events, 'w'))
c_events |= POLLIN; c_events |= POLLOUT;
scm_dynwind_begin (0); scm_dynwind_begin (0);
scm_dynwind_acquire_port (port); scm_dynwind_acquire_port (port);