From 48b920879baf9677c8254b45b3b48ee09a269894 Mon Sep 17 00:00:00 2001 From: Dai Sato Date: Mon, 29 May 2006 12:42:22 +0000 Subject: [w3m-dev-en 01057] delete calls to GC from wrap_GC_warn_proc to avoid deadlocks. --- ChangeLog | 7 ++++++- main.c | 9 ++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index daebab3..8a28924 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-05-29 Dai Sato + + * [w3m-dev-en 01067] Some more patches + * main.c: delete calls to GC from wrap_GC_warn_proc to avoid deadlocks. + 2006-05-29 Dai Sato * [w3m-dev-en 01067] Some more patches @@ -8718,4 +8723,4 @@ a * [w3m-dev 03276] compile error on EWS4800 * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.962 2006/05/29 12:28:01 inu Exp $ +$Id: ChangeLog,v 1.963 2006/05/29 12:42:22 inu Exp $ diff --git a/main.c b/main.c index 439ca09..b11913f 100644 --- a/main.c +++ b/main.c @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.251 2006/05/29 12:28:01 inu Exp $ */ +/* $Id: main.c,v 1.252 2006/05/29 12:42:22 inu Exp $ */ #define MAINPROGRAM #include "fm.h" #include @@ -293,10 +293,9 @@ wrap_GC_warn_proc(char *msg, GC_word arg) for (; n > 0; --n, ++i) { i %= sizeof(msg_ring) / sizeof(msg_ring[0]); - disp_message_nsec(Sprintf - (msg_ring[i].msg, - (unsigned long)msg_ring[i].arg)->ptr, FALSE, - 1, TRUE, FALSE); + + printf(msg_ring[i].msg, (unsigned long)msg_ring[i].arg); + sleep_till_anykey(1, 1); } lock = 0; -- cgit v1.2.3