aboutsummaryrefslogtreecommitdiffstats
path: root/main.c
diff options
context:
space:
mode:
authorMicah Cowan <micah@addictivecode.org>2014-08-22 11:45:50 +0000
committerTatsuya Kinoshita <tats@debian.org>2014-08-22 11:45:50 +0000
commit770eec8304bdbe4583b290ce92c63a2684e93aeb (patch)
tree545d22e13ecd1707f3a8b6a49c051a5413519d9a /main.c
parentRevert "Support Boehm GC 7.2" (w3m-0.5.2-gc72.patch from Gentoo) (diff)
downloadw3m-770eec8304bdbe4583b290ce92c63a2684e93aeb.tar.gz
w3m-770eec8304bdbe4583b290ce92c63a2684e93aeb.zip
Support Boehm GC 7.2
Replace Gentoo's patch to prevent segfaults due to infinite recursion. Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=080_gc72.patch;att=1;bug=758831 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=758831 Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=555467 Bug: http://sourceforge.net/p/w3m/patches/63/ Bug: http://sourceforge.net/p/w3m/patches/59/
Diffstat (limited to 'main.c')
-rw-r--r--main.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/main.c b/main.c
index cc17e0e..77eab95 100644
--- a/main.c
+++ b/main.c
@@ -845,7 +845,12 @@ main(int argc, char **argv, char **envp)
mySignal(SIGPIPE, SigPipe);
#endif
+#if GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 2
+ orig_GC_warn_proc = GC_get_warn_proc();
+ GC_set_warn_proc(wrap_GC_warn_proc);
+#else
orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc);
+#endif
err_msg = Strnew();
if (load_argc == 0) {
/* no URL specified */