aboutsummaryrefslogtreecommitdiffstats
path: root/main.c
diff options
context:
space:
mode:
authorTatsuya Kinoshita <tats@debian.org>2014-08-22 11:58:03 +0000
committerTatsuya Kinoshita <tats@debian.org>2014-08-22 11:58:03 +0000
commit411555fd5c41c548a92ce463e4199f8b90b45a8c (patch)
treee12409135c72963c7760dd889e61f16f02aef16d /main.c
parentMerge branch 'bug/changelog' (diff)
parentSupport Boehm GC 7.2 (diff)
downloadw3m-411555fd5c41c548a92ce463e4199f8b90b45a8c.tar.gz
w3m-411555fd5c41c548a92ce463e4199f8b90b45a8c.zip
Merge branch 'bug/gc72'
Diffstat (limited to 'main.c')
-rw-r--r--main.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/main.c b/main.c
index 3faaded..c8f1e82 100644
--- a/main.c
+++ b/main.c
@@ -320,11 +320,7 @@ 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);
@@ -894,6 +890,7 @@ main(int argc, char **argv, char **envp)
#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);