summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.adoc1
-rw-r--r--src/plugins/guile/weechat-guile.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index eced24657..b7a6728ee 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -33,6 +33,7 @@ Bug fixes::
* core: fix search of commands with UTF-8 chars in name when option weechat.look.command_incomplete is on (issue #1739)
* core: fix display of hotlist in buflist after changing value of option weechat.look.hotlist_sort (issue #1733)
* api: fix add of infolist items in hashtable when prefix contains UTF-8 chars in function hashtable_add_from_infolist (issue #1739)
+ * guile: remove disabling of guile gmp allocator with Guile ≥ 3.0.8
* irc: fix completion of channel topic with UTF-8 chars (issue #1739)
* irc: fix parsing of messages 311, 312, 327 (whois) and 314 (whowas) in case of missing parameters
* irc: fix parsing of message 223 (m_filter) sent by InspIRCd server (issue #1751)
diff --git a/src/plugins/guile/weechat-guile.c b/src/plugins/guile/weechat-guile.c
index 32febd4c6..a3108aa74 100644
--- a/src/plugins/guile/weechat-guile.c
+++ b/src/plugins/guile/weechat-guile.c
@@ -1261,14 +1261,14 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
if (!guile_buffer_output)
return WEECHAT_RC_ERROR;
-#ifdef HAVE_GUILE_GMP_MEMORY_FUNCTIONS
+#if defined(HAVE_GUILE_GMP_MEMORY_FUNCTIONS) && (SCM_MAJOR_VERSION < 3 || (SCM_MAJOR_VERSION == 3 && SCM_MINOR_VERSION == 0 && SCM_MICRO_VERSION < 8))
/*
* prevent guile to use its own gmp allocator, because it can conflict
* with other plugins using GnuTLS like relay, which can crash WeeChat
- * on unload (or exit)
+ * on unload (or exit); this is not needed any more with Guile ≥ 3.0.8
*/
scm_install_gmp_memory_functions = 0;
-#endif /* HAVE_GUILE_GMP_MEMORY_FUNCTIONS */
+#endif /* defined(HAVE_GUILE_GMP_MEMORY_FUNCTIONS) && (SCM_MAJOR_VERSION < 3 || (SCM_MAJOR_VERSION == 3 && SCM_MINOR_VERSION == 0 && SCM_MICRO_VERSION < 8)) */
scm_init_guile ();