mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-09 21:40:33 +02:00
Fix broken port merge.
* libguile/ports.c (finalize_port): Don't call `scm_remove_from_port_table ()'. (scm_flush): Don't refer to `scm_i_port_table_size'. (scm_ports_prehistory): Don't allocate `scm_i_port_table'. * libguile/ports.h (scm_i_port_table_room): Remove declaration.
This commit is contained in:
parent
6f03035fe8
commit
7f2a6c387c
2 changed files with 1 additions and 10 deletions
|
@ -547,7 +547,6 @@ finalize_port (GC_PTR ptr, GC_PTR data)
|
|||
|
||||
SCM_SETSTREAM (port, 0);
|
||||
SCM_CLR_PORT_OPEN_FLAG (port);
|
||||
scm_remove_from_port_table (port);
|
||||
|
||||
scm_gc_ports_collected++;
|
||||
}
|
||||
|
@ -1159,7 +1158,7 @@ void
|
|||
scm_flush (SCM port)
|
||||
{
|
||||
long i = SCM_PTOBNUM (port);
|
||||
assert ((i >= 0) && (i < scm_i_port_table_size));
|
||||
assert (i >= 0);
|
||||
(scm_ptobs[i].flush) (port);
|
||||
}
|
||||
|
||||
|
@ -1647,13 +1646,6 @@ scm_ports_prehistory ()
|
|||
{
|
||||
scm_numptob = 0;
|
||||
scm_ptobs = NULL;
|
||||
|
||||
/* In order for the ports to be collectable, the port table must not be
|
||||
scanned by the GC. */
|
||||
scm_i_port_table =
|
||||
scm_gc_malloc_pointerless (scm_i_port_table_room
|
||||
* sizeof (scm_t_port *),
|
||||
"port-table");
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -195,7 +195,6 @@ typedef struct scm_t_ptob_descriptor
|
|||
|
||||
SCM_API scm_t_ptob_descriptor *scm_ptobs;
|
||||
SCM_API long scm_numptob;
|
||||
SCM_INTERNAL long scm_i_port_table_room;
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue