Merge branch 'bug/gc72'
This commit is contained in:
8
main.c
8
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 */
|
||||
|
||||
Reference in New Issue
Block a user