From a4872fee57728a14d4ecfc7887be34cac07410e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?= <grubba@grubba.org> Date: Sun, 2 Aug 2020 14:23:17 +0200 Subject: [PATCH] Revert "Stdio.Buffer: Use PIKE_TYPEOF() macro." This reverts commit 2317b255de66f471eb1555165af276f51430015d. This commit was part of a set of speculative fixes that introduced other issues (SIGSEGV in testsuite). --- src/modules/_Stdio/buffer.cmod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/_Stdio/buffer.cmod b/src/modules/_Stdio/buffer.cmod index 4ca65d4496..c5c634f0a2 100644 --- a/src/modules/_Stdio/buffer.cmod +++ b/src/modules/_Stdio/buffer.cmod @@ -455,7 +455,7 @@ PIKECLASS Buffer PMOD_EXPORT void io_actually_trigger_output( Buffer *io ) { - if (PIKE_TYPEOF(io->output) == PIKE_T_FUNCTION) { + if (io->output.tu.named_type == PIKE_T_FUNCTION) { if (UNLIKELY(!io->output.u.object->prog)) { /* Destructed object. */ free_svalue(&io->output); @@ -994,7 +994,7 @@ PIKECLASS Buffer if (f) assign_svalue(&io->output, f); else { - if (PIKE_TYPEOF(io->output) == PIKE_T_FUNCTION) + if (io->output.tu.named_type == PIKE_T_FUNCTION) free_svalue(&io->output); } } -- GitLab