aboutsummaryrefslogtreecommitdiffstats
path: root/main.c
diff options
context:
space:
mode:
authorTatsuya Kinoshita <tats@vega.ocn.ne.jp>2012-05-03 10:30:32 +0000
committerTatsuya Kinoshita <tats@vega.ocn.ne.jp>2012-05-03 10:30:32 +0000
commit04f1d74f3c2edb4c5f23c3228073859e05b3eee0 (patch)
treeae6ae791b0e858ad7698e3645f7d514b44ac3e02 /main.c
parentMerge branch 'bug/file_handle_glibc214' (diff)
parentSupport Boehm GC 7.2 (diff)
downloadw3m-04f1d74f3c2edb4c5f23c3228073859e05b3eee0.tar.gz
w3m-04f1d74f3c2edb4c5f23c3228073859e05b3eee0.zip
Merge branch 'bug/gc72'
Diffstat (limited to '')
-rw-r--r--main.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/main.c b/main.c
index cc17e0e..7dcfd74 100644
--- a/main.c
+++ b/main.c
@@ -317,7 +317,11 @@ wrap_GC_warn_proc(char *msg, GC_word arg)
lock = 0;
}
}
+#if GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 2
+ else if (orig_GC_warn_proc = GC_get_warn_proc())
+#else
else if (orig_GC_warn_proc)
+#endif
orig_GC_warn_proc(msg, arg);
else
fprintf(stderr, msg, (unsigned long)arg);
@@ -845,7 +849,11 @@ main(int argc, char **argv, char **envp)
mySignal(SIGPIPE, SigPipe);
#endif
+#if GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 2
+ 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 */