From b761881096746585dec0580baf07802731673e97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Wed, 16 Oct 2019 11:06:35 +0200
Subject: [PATCH] Thread.ResourceCountKey: Survive being used with old pike
binaries.
Old pike 8.0 binaries do not have Pike.DestructImmediate, and it is
not meaningful to attempt to kludge around it, as the corresponding
program flag is not propagated with them anyway.
---
lib/modules/Thread.pmod | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/modules/Thread.pmod b/lib/modules/Thread.pmod
index 06c5052a97..a7b34cbb90 100644
--- a/lib/modules/Thread.pmod
+++ b/lib/modules/Thread.pmod
@@ -879,8 +879,9 @@ optional class Farm
//! @[ResourceCount], @[MutexKey]
//!
optional class ResourceCountKey {
-
- private inherit __builtin.DestructImmediate;
+#if constant(Pike.DestructImmediate)
+ private inherit Pike.DestructImmediate;
+#endif
/*semi*/private ResourceCount parent;
--
GitLab