storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bug/gc72'

Browse Source
This commit is contained in:
Tatsuya Kinoshita
2012-05-03 19:30:32 +09:00
parent 0b3230f84b 4331db3e3e
commit 04f1d74f3c
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.c
+8
View File
@@ -317,7 +317,11 @@ wrap_GC_warn_proc(char *msg, GC_word arg)
lock = 0; 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) else if (orig_GC_warn_proc)
#endif
orig_GC_warn_proc(msg, arg); orig_GC_warn_proc(msg, arg);
else else
fprintf(stderr, msg, (unsigned long)arg); fprintf(stderr, msg, (unsigned long)arg);
@@ -845,7 +849,11 @@ main(int argc, char **argv, char **envp)
mySignal(SIGPIPE, SigPipe); mySignal(SIGPIPE, SigPipe);
#endif #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); orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc);
#endif
err_msg = Strnew(); err_msg = Strnew();
if (load_argc == 0) { if (load_argc == 0) {
/* no URL specified */ /* no URL specified */